change cmake variable GEOS_BUILD_SHARED_LIBS to GEOS_BUILD_SHARED_COR…

…E_LIB
GEOS-DEV · Aug 15, 2024 · dbcfffc · dbcfffc
1 parent e915172
commit dbcfffc
Show file tree

Hide file tree

Showing 22 changed files with 25 additions and 25 deletions.
diff --git a/host-configs/LLNL/lassen-base.cmake b/host-configs/LLNL/lassen-base.cmake
@@ -7,7 +7,7 @@
 #
 ###############################################################################
 
-set( GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" )
+set( GEOS_BUILD_SHARED_CORE_LIB ON CACHE BOOL "" )
 set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" )
 # Fortran
 set(ENABLE_FORTRAN OFF CACHE BOOL "")

diff --git a/host-configs/ORNL/frontier-base.cmake b/host-configs/ORNL/frontier-base.cmake
@@ -31,7 +31,7 @@ set( ENABLE_DOCS OFF CACHE BOOL "" FORCE )
 set( ENABLE_SCOTCH OFF CACHE BOOL "" FORCE )
 set( ENABLE_SUPERLU_DIST OFF CACHE BOOL "" FORCE )
 
-set( GEOS_BUILD_SHARED_LIBS ON CACHE BOOL "" FORCE )
+set( GEOS_BUILD_SHARED_CORE_LIB ON CACHE BOOL "" FORCE )
 set( GEOS_BUILD_OBJ_LIBS OFF CACHE BOOL "" FORCE )
 
 set( CMAKE_CXX_STANDARD 17 CACHE STRING "" )

diff --git a/host-configs/TOTAL/pangea3-gcc8.4.1-openmpi-4.1.2.cmake b/host-configs/TOTAL/pangea3-gcc8.4.1-openmpi-4.1.2.cmake
@@ -77,7 +77,7 @@ set(ENABLE_MATHPRESSO OFF CACHE BOOL "")
 # Silo configure script doesn't recognize systype
 set(SILO_BUILD_TYPE powerpc64-unknown-linux-gnu CACHE STRING "")
 
-set(GEOS_BUILD_SHARED_LIBS OFF CACHE BOOL "")
+set(GEOS_BUILD_SHARED_CORE_LIB OFF CACHE BOOL "")
 set(ENABLE_PVTPackage ON CACHE BOOL "")
 
 set(ENABLE_CALIPER ON CACHE BOOL "")

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -135,7 +135,7 @@ if( ENABLE_HIP )
   list( APPEND extraComponentsLinkList blt::hip )
 endif()
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND extraComponentsLinkList geosx_core )
 else()
   list( APPEND extraComponentsLinkList ${geosx_core_libs} )

diff --git a/src/cmake/GeosxOptions.cmake b/src/cmake/GeosxOptions.cmake
@@ -89,7 +89,7 @@ option( GEOS_INSTALL_SCHEMA "Enables schema generation and installation" ON )
 
 option( GEOS_BUILD_OBJ_LIBS "Builds coreComponent modules as object libraries" OFF )
 
-option( GEOS_BUILD_SHARED_LIBS "Builds geosx_core as a shared library " ON )
+option( GEOS_BUILD_SHARED_CORE_LIB "Builds geosx_core as a shared library " ON )
 
 set( GEOS_PARALLEL_COMPILE_JOBS "" CACHE STRING "Maximum number of concurrent compilation jobs" )
 if( GEOS_PARALLEL_COMPILE_JOBS )

diff --git a/src/coreComponents/CMakeLists.txt b/src/coreComponents/CMakeLists.txt
@@ -57,7 +57,7 @@ foreach( lib ${subdirs} )
 endforeach()
 
 # if we're building full static libs and not obj_libs
-if( NOT GEOS_BUILD_SHARED_LIBS )
+if( NOT GEOS_BUILD_SHARED_CORE_LIB )
   set( geosx_core_list "" )
   foreach( lib ${coreLibs} )
     list( APPEND geosx_core_list ${GEOS_LINK_PREPEND_FLAG} ${lib} ${GEOS_LINK_POSTPEND_FLAG} )
@@ -69,22 +69,22 @@ foreach( lib ${subdirs} )
   add_subdirectory( ${lib} )
 endforeach()
 
-if( GEOS_BUILD_SHARED_LIBS AND GEOS_BUILD_OBJ_LIBS )
+if( GEOS_BUILD_SHARED_CORE_LIB AND GEOS_BUILD_OBJ_LIBS )
   message( "Building shared geosx_core library with object coreComponents, executables link to geosx_core" )
   blt_add_library ( NAME geosx_core
                     SOURCES dummy.cpp
                     DEPENDS_ON  mainInterface physicsSolvers HDF5::HDF5
                     SHARED TRUE )
 
-elseif( GEOS_BUILD_SHARED_LIBS AND NOT GEOS_BUILD_OBJ_LIBS )
+elseif( GEOS_BUILD_SHARED_CORE_LIB AND NOT GEOS_BUILD_OBJ_LIBS )
   message( "Building shared geosx_core library with static coreComponents, executables link to geosx_core" )
   blt_combine_static_libraries( NAME          geosx_core
                                 SOURCE_LIBS   ${coreLibs}
                                 LIB_TYPE      SHARED
                                 LINK_PREPEND  ${GEOS_LINK_PREPEND_FLAG}
                                 LINK_POSTPEND ${GEOS_LINK_POSTPEND_FLAG} )
 
-elseif( NOT GEOS_BUILD_SHARED_LIBS AND GEOS_BUILD_OBJ_LIBS )
+elseif( NOT GEOS_BUILD_SHARED_CORE_LIB AND GEOS_BUILD_OBJ_LIBS )
   message( "Building object coreComponents, executables link to coreComponents" )
 else()
   message( "Building static coreComponents, executables link to coreComponents" )

diff --git a/src/coreComponents/functions/unitTests/CMakeLists.txt b/src/coreComponents/functions/unitTests/CMakeLists.txt
@@ -5,7 +5,7 @@ set( gtest_geosx_tests
 
 set( dependencyList ${parallelDeps} gtest functions )
 
-# if ( GEOS_BUILD_SHARED_LIBS )
+# if ( GEOS_BUILD_SHARED_CORE_LIB )
 #   list( APPEND dependencyList geosx_core )
 # else()
 #   list( APPEND dependencyList ${geosx_core_libs} )

diff --git a/src/coreComponents/unitTests/constitutiveTests/CMakeLists.txt b/src/coreComponents/unitTests/constitutiveTests/CMakeLists.txt
@@ -34,7 +34,7 @@ set( gtest_reactivefluid_xmls
 
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/dataRepositoryTests/CMakeLists.txt b/src/coreComponents/unitTests/dataRepositoryTests/CMakeLists.txt
@@ -8,7 +8,7 @@ set( dataRepository_tests
 
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/fieldSpecificationTests/CMakeLists.txt b/src/coreComponents/unitTests/fieldSpecificationTests/CMakeLists.txt
@@ -7,7 +7,7 @@ set( gtest_geosx_tests
 
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/fileIOTests/CMakeLists.txt b/src/coreComponents/unitTests/fileIOTests/CMakeLists.txt
@@ -3,7 +3,7 @@ set( geosx_fileio_tests testHDFFile.cpp )
 
 set( dependencyList ${parallelDeps} gtest HDF5::HDF5 )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core )
 else()
   list( APPEND dependencyList ${geosx_core_libs} )

diff --git a/src/coreComponents/unitTests/finiteVolumeTests/CMakeLists.txt b/src/coreComponents/unitTests/finiteVolumeTests/CMakeLists.txt
@@ -4,7 +4,7 @@ set( gtest_geosx_tests
 
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/fluidFlowTests/CMakeLists.txt b/src/coreComponents/unitTests/fluidFlowTests/CMakeLists.txt
@@ -8,7 +8,7 @@ set( gtest_geosx_tests
 
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/linearAlgebraTests/CMakeLists.txt b/src/coreComponents/unitTests/linearAlgebraTests/CMakeLists.txt
@@ -8,7 +8,7 @@ set( nranks 2 )
 # Add gtest C++ based tests
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/meshTests/CMakeLists.txt b/src/coreComponents/unitTests/meshTests/CMakeLists.txt
@@ -21,7 +21,7 @@ endif()
 
 set( dependencyList ${parallelDeps} gtest )
 
-if( GEOS_BUILD_SHARED_LIBS )
+if( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/testingUtilities/CMakeLists.txt b/src/coreComponents/unitTests/testingUtilities/CMakeLists.txt
@@ -17,7 +17,7 @@ set( testingUtilities_sources
 #
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/virtualElementTests/CMakeLists.txt b/src/coreComponents/unitTests/virtualElementTests/CMakeLists.txt
@@ -4,7 +4,7 @@ set( testSources
 
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/wavePropagationTests/CMakeLists.txt b/src/coreComponents/unitTests/wavePropagationTests/CMakeLists.txt
@@ -10,7 +10,7 @@ set( gtest_geosx_tests
 
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/wellsTests/CMakeLists.txt b/src/coreComponents/unitTests/wellsTests/CMakeLists.txt
@@ -5,7 +5,7 @@ set( gtest_geosx_tests
 
 set( dependencyList ${parallelDeps} gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core ${parallelDeps} HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} ${parallelDeps} HDF5::HDF5 )

diff --git a/src/coreComponents/unitTests/xmlTests/CMakeLists.txt b/src/coreComponents/unitTests/xmlTests/CMakeLists.txt
@@ -18,7 +18,7 @@ set( multi_files
 # Add gtest C++ based tests
 set( dependencyList ${parallelDeps} gtest optionparser HDF5::HDF5 )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core HDF5::HDF5 )
 else()
   list( APPEND dependencyList ${geosx_core_libs} HDF5::HDF5 )

diff --git a/src/externalComponents/newComponentTemplate/src/CMakeLists.txt b/src/externalComponents/newComponentTemplate/src/CMakeLists.txt
@@ -9,7 +9,7 @@ set( componentSources NewComponent.cpp )
 unset( dependencyList )
 
 # Specify dependencies
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core)
 else()
   list( APPEND dependencyList ${geosx_core_libs} )

diff --git a/src/externalComponents/newComponentTemplate/tests/CMakeLists.txt b/src/externalComponents/newComponentTemplate/tests/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Specify list of tests
 set( dependencyList gtest )
 
-if ( GEOS_BUILD_SHARED_LIBS )
+if ( GEOS_BUILD_SHARED_CORE_LIB )
   list( APPEND dependencyList geosx_core )
 else()
   list( APPEND dependencyList ${geosx_core_libs} )