From 3297d31f39ce2c3d7b03b6556ba620a69cb57839 Mon Sep 17 00:00:00 2001 From: Mikyung Lee Date: Fri, 29 Jan 2021 10:37:22 -0600 Subject: [PATCH 1/3] changes fms target to fms_r4 or fms_r8 in CMakeLists.txt --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ec2f29a0..c4f2011e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,7 +53,11 @@ list(APPEND _stoch_phys_srcs ) add_library(stochastic_physics ${_stoch_phys_srcs}) -add_dependencies(stochastic_physics fms) +if(32BIT) + add_dependencies(stochastic_physics fms_r4) +else() + add_dependencies(stochastic_physics fms_r8) +endif() target_compile_definitions(stochastic_physics PRIVATE INTERNAL_FILE_NML) From a4540c906140edeae363c36228cd2510b29ba648 Mon Sep 17 00:00:00 2001 From: Mikyung Lee Date: Fri, 29 Jan 2021 11:11:59 -0600 Subject: [PATCH 2/3] adds missed fms target to fms_r4 or fms_r8 in CMakeLists.txt --- CMakeLists.txt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c4f2011e..e3a5e01f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -62,7 +62,11 @@ endif() target_compile_definitions(stochastic_physics PRIVATE INTERNAL_FILE_NML) target_link_libraries(stochastic_physics PUBLIC sp::sp_d) -target_link_libraries(stochastic_physics PUBLIC fms) +if(32BIT) + target_link_libraries(stochastic_physics PUBLIC fms_r4) +else() + target_link_libraries(stochastic_physics PUBLIC fms_r8) +endif() if(OpenMP_Fortran_FOUND) target_link_libraries(stochastic_physics PUBLIC OpenMP::OpenMP_Fortran) endif() From 466699c172b7ab43d8480cc194601fa175ac59d5 Mon Sep 17 00:00:00 2001 From: Mikyung Lee Date: Fri, 29 Jan 2021 12:52:29 -0600 Subject: [PATCH 3/3] use FMS namespace --- CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e3a5e01f..c2793db2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -53,19 +53,19 @@ list(APPEND _stoch_phys_srcs ) add_library(stochastic_physics ${_stoch_phys_srcs}) -if(32BIT) - add_dependencies(stochastic_physics fms_r4) +if(32BIT) + add_dependencies(stochastic_physics FMS::fms_r4) else() - add_dependencies(stochastic_physics fms_r8) + add_dependencies(stochastic_physics FMS::fms_r8) endif() target_compile_definitions(stochastic_physics PRIVATE INTERNAL_FILE_NML) target_link_libraries(stochastic_physics PUBLIC sp::sp_d) if(32BIT) - target_link_libraries(stochastic_physics PUBLIC fms_r4) + target_link_libraries(stochastic_physics PUBLIC FMS::fms_r4) else() - target_link_libraries(stochastic_physics PUBLIC fms_r8) + target_link_libraries(stochastic_physics PUBLIC FMS::fms_r8) endif() if(OpenMP_Fortran_FOUND) target_link_libraries(stochastic_physics PUBLIC OpenMP::OpenMP_Fortran)