Update CMake to be more in GEOS style

Author: mathomp4

CMakeLists.txt

@@ -11,11 +11,9 @@ set (alldirs
 option(BUILD_WITH_GIGATRAJ "Build GEOSgcm with Gigatraj" OFF)
 
 if (BUILD_WITH_GIGATRAJ)
-  add_definitions (-DHAS_GIGATRAJ)
-  set (alldirs ${alldirs} GEOSgigatraj_GridComp) 
+  list(APPEND alldirs GEOSgigatraj_GridComp)
 endif()
 
-
 if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_GcmGridComp.F90)
 
  ecbuild_declare_project()
@@ -24,6 +22,8 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_GcmGridComp.F90)
     SUBCOMPONENTS ${alldirs}
     DEPENDENCIES MAPL ESMF::ESMF)
 
+  target_compile_definitions (${this} PRIVATE $<$<BOOL:${BUILD_WITH_GIGATRAJ}>:HAS_GIGATRAJ>)
+
   ecbuild_install_project( NAME GEOSgcm_GridComp)
 
 else ()

GEOSagcm_GridComp/CMakeLists.txt

@@ -20,6 +20,8 @@ elseif (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_AgcmGridComp.F90)
     SUBCOMPONENTS ${alldirs}
     DEPENDENCIES MAPL GEOS_Shared Chem_Shared ESMF::ESMF)
 
+  target_compile_definitions (${this} PRIVATE $<$<BOOL:${BUILD_WITH_GIGATRAJ}>:HAS_GIGATRAJ>)
+
 else ()
 
   esma_add_subdirectories (${alldirs})

GEOSagcm_GridComp/GEOSsuperdyn_GridComp/CMakeLists.txt

@@ -20,6 +20,8 @@ if (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/GEOS_SuperdynGridComp.F90)
     SUBCOMPONENTS ${alldirs}
     DEPENDENCIES MAPL GEOS_Shared ESMF::ESMF)
 
+  target_compile_definitions (${this} PRIVATE $<$<BOOL:${BUILD_WITH_GIGATRAJ}>:HAS_GIGATRAJ>)
+
 else ()
 
   esma_add_subdirectories (${alldirs})

GEOSgigatraj_GridComp/.gitignore

@@ -0,0 +1,3 @@
+@GigaTraj/
+GigaTraj/
+GigaTraj@/

GEOSgigatraj_GridComp/CMakeLists.txt

@@ -3,7 +3,7 @@ esma_set_this()
 set (dependencies MAPL ESMF::ESMF geos_giga metsources filters gigatraj)
 
 esma_add_library (${this}
-  SRCS GEOS_Giga_InterOp.F90 Gigatraj_Utils.F90 GEOS_GigatrajGridComp.F90 
+  SRCS GEOS_Giga_InterOp.F90 Gigatraj_Utils.F90 GEOS_GigatrajGridComp.F90
   DEPENDENCIES ${dependencies})
 
-esma_add_subdirectories( @GigaTraj)
+esma_add_subdirectories(GigaTraj)