Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Minor changes related to fypp prepocessing #758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jvdp1 merged 8 commits into fortran-lang:master from jvdp1:reog_common
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions API-doc-FORD-file.md
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ project: Fortran-lang/stdlib
summary: A community driven standard library for (modern) Fortran
src_dir: src
include: src
include
exclude_dir: src/tests
output_dir: API-doc
page_dir: doc
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ list(
"-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
"-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}"
"-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"
"-I${PROJECT_SOURCE_DIR}/include"
)

add_subdirectory(src)
Expand Down
3 changes: 1 addition & 2 deletions ci/fpm-deployment.sh
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,14 +30,13 @@ prune=(
"$destdir/test/test_always_fail.f90"
"$destdir/test/test_always_skip.f90"
"$destdir/test/test_hash_functions.f90"
"$destdir/src/common.f90"
"$destdir/src/f18estop.f90"
)

major=$(cut -d. -f1 VERSION)
minor=$(cut -d. -f2 VERSION)
patch=$(cut -d. -f3 VERSION)
fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch}"
fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch} -I include"

mkdir -p "$destdir/src" "$destdir/test" "$destdir/example"

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions src/f08estop.f90
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
submodule (stdlib_error) estop
submodule (stdlib_error) f08estop

implicit none

Expand Down Expand Up @@ -38,4 +38,4 @@
endif
end procedure

end submodule
end submodule f08estop
4 changes: 2 additions & 2 deletions src/f18estop.f90
View file Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
submodule (stdlib_error) estop
submodule (stdlib_error) f18estop

implicit none

Expand Down Expand Up @@ -26,4 +26,4 @@
endif
end procedure

end submodule estop
end submodule f18estop
5 changes: 0 additions & 5 deletions test/CMakeLists.txt
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,6 @@ macro(ADDTEST name)
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
endmacro(ADDTEST)

list(
APPEND fyppFlags
"-I${PROJECT_SOURCE_DIR}/src"
)

add_subdirectory(array)
add_subdirectory(ascii)
add_subdirectory(bitsets)
Expand Down
2 changes: 1 addition & 1 deletion test/hash_functions/CMakeLists.txt
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ ADDTEST(hash_functions)
target_sources(
test_hash_functions
PRIVATE
nmhash_scalar.c
nmhash.c
pengyhash.c
SpookyV2.cpp
SpookyV2Test.cpp
Expand Down
1 change: 0 additions & 1 deletion test/hash_functions/generate_hash_arrays.cpp
View file Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

extern "C" {
#include "nmhash.h"
#include "nmhash_scalar.h"
#include "pengyhash.h"
#include "waterhash.h"
int generate_all_c_hash();
Expand Down
8 changes: 0 additions & 8 deletions test/hash_functions/nmhash_scalar.c
View file Open in desktop

This file was deleted.

Loading

AltStyle によって変換されたページ (->オリジナル) /