Fixed problem that occurs if the LIBS environment variable has leadin…

…g or trailing spaces
MintonGroup · Aug 17, 2023 · 8c99d27 · 8c99d27
1 parent 4aa0e1a
commit 8c99d27
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/cmake/Modules/FindNETCDF.cmake b/cmake/Modules/FindNETCDF.cmake
@@ -131,7 +131,8 @@ ELSE ()
       MESSAGE(FATAL_ERROR "Cannot find nc-config")
    ENDIF ()
    IF (DEFINED ENV{LIBS})
-      SEPARATE_ARGUMENTS(LIBS NATIVE_COMMAND "$ENV{LIBS}")
+      STRING(STRIP "$ENV{LIBS}" LIBS)
+      SEPARATE_ARGUMENTS(LIBS NATIVE_COMMAND "$LIBS")
       LIST(APPEND EXTRA_FLAGS ${LIBS})
    ENDIF()
 

diff --git a/swiftest/CMakeLists.txt b/swiftest/CMakeLists.txt
@@ -37,7 +37,12 @@ IF(USE_OPENMP OR USE_SIMD)
     SET_PROPERTY(TARGET ${SWIFTEST_BINDINGS} APPEND_STRING PROPERTY COMPILE_FLAGS  "${OpenMP_Fortran_FLAGS} ")
 ENDIF()
 
-TARGET_LINK_LIBRARIES(${SWIFTEST_BINDINGS} swiftest ${NETCDF_LIBRARIES} $ENV{LIBS})
+IF (DEFINED ENV{LIBS})
+    STRING(STRIP "$ENV{LIBS}" LIBS)
+    SEPARATE_ARGUMENTS(LIBS NATIVE_COMMAND "$LIBS")
+ENDIF()
+
+TARGET_LINK_LIBRARIES(${SWIFTEST_BINDINGS} swiftest ${NETCDF_LIBRARIES} $LIBS)
 PYTHON_EXTENSION_MODULE(${SWIFTEST_BINDINGS})
 TARGET_INCLUDE_DIRECTORIES(${SWIFTEST_BINDINGS} PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${MOD} ${NETCDF_INCLUDE_DIR})
 INSTALL(TARGETS ${SWIFTEST_BINDINGS} LIBRARY DESTINATION swiftest)