From 8c99d27c049f81b8bee19b1e6082d9a4bb8dc439 Mon Sep 17 00:00:00 2001 From: David Minton Date: Thu, 17 Aug 2023 13:28:13 -0400 Subject: [PATCH] Fixed problem that occurs if the LIBS environment variable has leading or trailing spaces --- cmake/Modules/FindNETCDF.cmake | 3 ++- swiftest/CMakeLists.txt | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/cmake/Modules/FindNETCDF.cmake b/cmake/Modules/FindNETCDF.cmake index c7986a90a..18be98d07 100644 --- 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 index 633b2b6d1..035de8acd 100644 --- 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) \ No newline at end of file