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

Commit d89a6e2

Browse files
authored
Merge pull request #758 from jvdp1/reog_common
Minor changes related to `fypp` prepocessing
2 parents c086185 + fd91311 commit d89a6e2

File tree

13 files changed

+100
-847
lines changed

13 files changed

+100
-847
lines changed

‎API-doc-FORD-file.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ project: Fortran-lang/stdlib
33
summary: A community driven standard library for (modern) Fortran
44
src_dir: src
55
include: src
6+
include
67
exclude_dir: src/tests
78
output_dir: API-doc
89
page_dir: doc

‎CMakeLists.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ list(
6565
"-DPROJECT_VERSION_MAJOR=${PROJECT_VERSION_MAJOR}"
6666
"-DPROJECT_VERSION_MINOR=${PROJECT_VERSION_MINOR}"
6767
"-DPROJECT_VERSION_PATCH=${PROJECT_VERSION_PATCH}"
68+
"-I${PROJECT_SOURCE_DIR}/include"
6869
)
6970

7071
add_subdirectory(src)

‎ci/fpm-deployment.sh‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,14 +30,13 @@ prune=(
3030
"$destdir/test/test_always_fail.f90"
3131
"$destdir/test/test_always_skip.f90"
3232
"$destdir/test/test_hash_functions.f90"
33-
"$destdir/src/common.f90"
3433
"$destdir/src/f18estop.f90"
3534
)
3635

3736
major=$(cut -d. -f1 VERSION)
3837
minor=$(cut -d. -f2 VERSION)
3938
patch=$(cut -d. -f3 VERSION)
40-
fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch}"
39+
fyflags="${fyflags} -DPROJECT_VERSION_MAJOR=${major} -DPROJECT_VERSION_MINOR=${minor} -DPROJECT_VERSION_PATCH=${patch} -I include"
4140

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

File renamed without changes.

‎src/f08estop.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
submodule (stdlib_error) estop
1+
submodule (stdlib_error) f08estop
22

33
implicit none
44

@@ -38,4 +38,4 @@
3838
endif
3939
end procedure
4040

41-
end submodule
41+
end submodule f08estop

‎src/f18estop.f90‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
submodule (stdlib_error) estop
1+
submodule (stdlib_error) f18estop
22

33
implicit none
44

@@ -26,4 +26,4 @@
2626
endif
2727
end procedure
2828

29-
end submodule estop
29+
end submodule f18estop

‎test/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,6 @@ macro(ADDTEST name)
1010
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
1111
endmacro(ADDTEST)
1212

13-
list(
14-
APPEND fyppFlags
15-
"-I${PROJECT_SOURCE_DIR}/src"
16-
)
17-
1813
add_subdirectory(array)
1914
add_subdirectory(ascii)
2015
add_subdirectory(bitsets)

‎test/hash_functions/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ADDTEST(hash_functions)
77
target_sources(
88
test_hash_functions
99
PRIVATE
10-
nmhash_scalar.c
10+
nmhash.c
1111
pengyhash.c
1212
SpookyV2.cpp
1313
SpookyV2Test.cpp

‎test/hash_functions/generate_hash_arrays.cpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
extern "C" {
55
#include "nmhash.h"
6-
#include "nmhash_scalar.h"
76
#include "pengyhash.h"
87
#include "waterhash.h"
98
int generate_all_c_hash();

‎test/hash_functions/nmhash_scalar.c‎

Lines changed: 0 additions & 8 deletions
This file was deleted.

0 commit comments

Comments
(0)

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