Use target_compile_definitions. Make w3emc PP variable use the same f…

…ormat as ip. #23
NOAA-EMC · Nov 20, 2023 · 8a68f5a · 8a68f5a
1 parent bab6d7b
commit 8a68f5a
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 12 deletions.
diff --git a/src/enkf_chgres_recenter_nc.fd/CMakeLists.txt b/src/enkf_chgres_recenter_nc.fd/CMakeLists.txt
@@ -10,9 +10,6 @@ utils.f90
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^(Intel)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fp-model precise")
 endif()
-if(ip_VERSION VERSION_GREATER_EQUAL 4.0.0)
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DIP_V4")
-endif()
 
 set(exe_name enkf_chgres_recenter_nc.x)
 add_executable(${exe_name} ${fortran_src})
@@ -26,4 +23,8 @@ if(OpenMP_Fortran_FOUND)
   target_link_libraries(${exe_name} PRIVATE OpenMP::OpenMP_Fortran)
 endif()
 
+if(ip_VERSION VERSION_GREATER_EQUAL 4.0.0)
+   target_compile_definitions(${exe_name} PRIVATE "IP_V4")
+endif()
+
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/fbwndgfs.fd/CMakeLists.txt b/src/fbwndgfs.fd/CMakeLists.txt
@@ -8,15 +8,15 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
   set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -fdefault-real-8 -fdefault-integer-8 -fconvert=big-endian")
 endif()
 
-if(w3emc_VERSION VERSION_GREATER_EQUAL 2.10)
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DW3EMC_210")
-endif()
-
 set(exe_name fbwndgfs.x)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(${exe_name} PRIVATE bacio::bacio_8
                                           ip::ip_8
                                           sp::sp_8
                                           w3emc::w3emc_8)
 
+if(w3emc_VERSION VERSION_GREATER_EQUAL 2.10)
+   target_compile_definitions(${exe_name} PRIVATE "W3EMC_V2_10")
+endif()
+
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
diff --git a/src/fbwndgfs.fd/fbwndgfs.F b/src/fbwndgfs.fd/fbwndgfs.F
@@ -399,7 +399,7 @@
                   DO 110 J = 1,NRSTNS
 C                     CALL GDSWIZ(KGDS,-1,1,FILL,XPTS(J),YPTS(J),
 C     &                    ALON(J),ALAT(J),IRET,0,DUM,DUM)
-#ifdef W3EMC_210
+#ifdef W3EMC_V2_10
                      CALL GDSWZD_GRIB1(KGDS,-1,1,FILL,XPTS(J),YPTS(J),
      &                    ALON(J),ALAT(J),IRET)
 #else

diff --git a/src/mkgfsawps.fd/CMakeLists.txt b/src/mkgfsawps.fd/CMakeLists.txt
@@ -10,10 +10,6 @@ elseif(CMAKE_Fortran_COMPILER_ID MATCHES "^(GNU)$")
   set_source_files_properties(${fortran_src_free} PROPERTIES COMPILE_FLAGS "-ffree-form")
 endif()
 
-if(ip_VERSION VERSION_GREATER_EQUAL 4.0.0)
-  set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -DIP_V4")
-endif()
-
 set(exe_name mkgfsawps.x)
 add_executable(${exe_name} ${fortran_src})
 target_link_libraries(${exe_name} PRIVATE bacio::bacio_4
@@ -24,4 +20,8 @@ if(OpenMP_Fortran_FOUND)
   target_link_libraries(${exe_name} PRIVATE OpenMP::OpenMP_Fortran)
 endif()
 
+if(ip_VERSION VERSION_GREATER_EQUAL 4.0.0)
+   target_compile_definitions(${exe_name} PRIVATE "IP_V4")
+endif()
+
 install(TARGETS ${exe_name} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})