fix default p4 gomp root

GEOS-DEV · Dec 17, 2024 · a82568b · a82568b
1 parent e32bab7
commit a82568b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/host-configs/TotalEnergies/pangea-4/pangea4-base.cmake b/host-configs/TotalEnergies/pangea-4/pangea4-base.cmake
@@ -63,12 +63,3 @@ set( RAJA_ENABLE_TBB    OFF         CACHE BOOL "" FORCE )
 
 set( ENABLE_PYGEOSX         ON CACHE BOOL "" )
 set( ENABLE_VTK_WRAP_PYTHON ON CACHE BOOL "" )
-
-#######################################
-# TPLs
-#######################################
-
-set(GEOS_TPL_DIR "$ENV{GEOS_TPL_DIR}" CACHE PATH "" FORCE)
-if (NOT DEFINED GEOS_TPL_DIR)
-  message(FATAL_ERROR "You must set GEOS_TPL_DIR with -DGEOS_TPL_DIR=")
-endif ()
diff --git a/host-configs/TotalEnergies/pangea-4/pangea4-gcc12.1-hpcxompi2.20.0-onemkl2023.2.0.cmake b/host-configs/TotalEnergies/pangea-4/pangea4-gcc12.1-hpcxompi2.20.0-onemkl2023.2.0.cmake
@@ -92,7 +92,8 @@ if( NOT DEFINED ENV{MKLROOT} )
 endif()
 
 if ( NOT DEFINED ENV{GOMP_ROOT} )
-    set( GOMP_ROOT $ENV{GCC_PATH}/lib/gcc/x86_64-redhat-linux/12/libgomp.so )
+    message( STATUS "GOMP_ROOT is not set. Setting it to $ENV{GCC_PATH}/lib/gcc/x86_64-redhat-linux/12" )
+    set( ENV{GOMP_ROOT} $ENV{GCC_PATH}/lib/gcc/x86_64-redhat-linux/12 )
 endif()
 
 set( MKL_INCLUDE_DIRS $ENV{MKLROOT}/include CACHE STRING "" )

diff --git a/host-configs/TotalEnergies/pangea-4/pangea4-gcc12.1-openmpi4.1.6-onemkl2023.2.0.cmake b/host-configs/TotalEnergies/pangea-4/pangea4-gcc12.1-openmpi4.1.6-onemkl2023.2.0.cmake
@@ -92,7 +92,8 @@ if( NOT DEFINED ENV{MKLROOT} )
 endif()
 
 if ( NOT DEFINED ENV{GOMP_ROOT} )
-    set( GOMP_ROOT $ENV{GCC_PATH}/lib/gcc/x86_64-redhat-linux/12/libgomp.so )
+    message( STATUS "GOMP_ROOT is not set. Setting it to $ENV{GCC_PATH}/lib/gcc/x86_64-redhat-linux/12" )
+    set( ENV{GOMP_ROOT} $ENV{GCC_PATH}/lib/gcc/x86_64-redhat-linux/12 )
 endif()
 
 set( MKL_INCLUDE_DIRS $ENV{MKLROOT}/include CACHE STRING "" )