[ENH] Trying to get loading paths from Salomon modules working for OpenBLAS & Boost.

cmake/FindBoost.cmake

@@ -25,6 +25,14 @@
 
 MESSAGE("FindBoost starting...")
 
+# Parse environment variables set up on Salomon cluster
+string(REPLACE ";" ":" CPATH_LOC "${CPATH}")
+string(REPLACE ";" ":" CPATH_ENV "$ENV{CPATH}")
+string(REPLACE ";" ":" LD_LIBRARY_PATH_LOC "${LD_LIBRARY_PATH}")
+string(REPLACE ";" ":" LD_LIBRARY_PATH_ENV "$ENV{LD_LIBRARY_PATH}")
+string(REPLACE ";" ":" LIBRARY_PATH_LOC "${LIBRARY_PATH}")
+string(REPLACE ";" ":" LIBRARY_PATH_ENV "$ENV{LIBRARY_PATH}")
+
 # Check if needed Boost components were specified
 IF(NOT Boost_FIND_COMPONENTS)
     MESSAGE(FATAL_ERROR "No Boost components were specified! Please, set them correctly with flag COMPONENTS (see Module Usage section in this script).")
@@ -48,6 +56,8 @@ FIND_PATH(
     $ENV{HOME}/boost
     ${ROOT_DIR}/external_dependencies/boost
     ${ROOT_DIR}/external_dependencies/boost/src/boost
+    ${CPATH_LOC}
+    ${CPATH_ENV}
 
     PATHS
     /usr/include
@@ -100,7 +110,10 @@ FIND_PATH(
     ${ROOT_DIR}/external_dependencies/boost/src/boost
     ${ROOT_DIR}/external_dependencies/boost/stage
     ${ROOT_DIR}/external_dependencies/boost/stage/lib
-
+    ${LD_LIBRARY_PATH_LOC}
+    ${LD_LIBRARY_PATH_ENV}
+    ${LIBRARY_PATH_LOC}
+    ${LIBRARY_PATH_ENV}
 
     PATHS
     /usr/lib/boost

cmake/FindOpenBLAS.cmake

 MESSAGE("FindOpenBLAS starting...")
 
+# Parse environment variables set up on Salomon cluster
+string(REPLACE ";" ":" CPATH_LOC "${CPATH}")
+string(REPLACE ";" ":" CPATH_ENV "$ENV{CPATH}")
+string(REPLACE ";" ":" LD_LIBRARY_PATH_LOC "${LD_LIBRARY_PATH}")
+string(REPLACE ";" ":" LD_LIBRARY_PATH_ENV "$ENV{LD_LIBRARY_PATH}")
+string(REPLACE ";" ":" LIBRARY_PATH_LOC "${LIBRARY_PATH}")
+string(REPLACE ";" ":" LIBRARY_PATH_ENV "$ENV{LIBRARY_PATH}")
+
 FIND_PATH(
     OpenBLAS_INCLUDE_DIR
 
@@ -10,6 +18,8 @@ FIND_PATH(
     ${OpenBLAS_INCLUDE_DIRECTORY}
     $ENV{OpenBLAS_INCLUDE_DIRECTORY}
     ${ROOT_DIR}/external_dependencies/OpenBLAS
+    ${CPATH_LOC}
+    ${CPATH_ENV}
     /usr
 
     PATH_SUFFIXES
@@ -29,6 +39,10 @@ FIND_LIBRARY(
     $ENV{OpenBLAS_LIBRARY_DIRECTORY}
     $ENV{HOME}/OpenBLAS
     ${ROOT_DIR}/external_dependencies/OpenBLAS/
+    ${LD_LIBRARY_PATH_LOC}
+    ${LD_LIBRARY_PATH_ENV}
+    ${LIBRARY_PATH_LOC}
+    ${LIBRARY_PATH_ENV}
     /usr
 
     PATH_SUFFIXES
@@ -39,8 +53,8 @@ FIND_LIBRARY(
     include/OpenBLAS/lib
 )
 
-set(BLAS_LIBRARIES ${OpenBLAS_LIBRARIES})
-set(LAPACK_LIBRARIES ${OpenBLAS_LIBRARIES})
+#set(BLAS_LIBRARIES ${OpenBLAS_LIBRARIES})
+#set(LAPACK_LIBRARIES ${OpenBLAS_LIBRARIES})
 
 # Set OpenBLAS_Found
 INCLUDE(FindPackageHandleStandardArgs)
@@ -53,8 +67,8 @@ FIND_PACKAGE_HANDLE_STANDARD_ARGS(
     REQUIRED_VARS
     OpenBLAS_INCLUDE_DIR
     OpenBLAS_LIBRARIES
-    BLAS_LIBRARIES
-    LAPACK_LIBRARIES
+#    BLAS_LIBRARIES
+#    LAPACK_LIBRARIES
 )
 
 IF(OpenBLAS_FOUND)