Attention une mise à jour du serveur va être effectuée le lundi 17 mai entre 13h et 13h30. Cette mise à jour va générer une interruption du service de quelques minutes.

Commit 3764cbfd authored by BRAMAS Berenger's avatar BRAMAS Berenger

change the format of the variable that contains the lib (and lib path) in the config file

parent 63d50460
......@@ -632,8 +632,12 @@ if (MORSE_DISTRIB_DIR OR EXISTS "${CMAKE_SOURCE_DIR}/CMakeModules/morse/")
#
set(SCALFMM_COMPILE_FLAGS "${SCALFMM_CXX_FLAGS} ${CMAKE_CXX_FLAGS_TYPE} ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS "${SCALFMM_COMPILE_FLAGS}")
# set(CMAKE_CXX_FLAGS "${SCALFMM_COMPILE_FLAGS} ${CMAKE_CXX_FLAGS_TYPE} ${CMAKE_CXX_FLAGS}")
set(SCALFMM_COMPILE_LIBS "${SCALFMM_LIBRARIES}")
# We need the libraries without spaces (inside the config file)
set(SCALFMM_COMPILE_LIBS "")
foreach(lib_var ${SCALFMM_LIBRARIES})
string(STRIP ${lib_var} lib_var)
LIST(APPEND SCALFMM_COMPILE_LIBS ${lib_var})
endforeach()
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/Src/ScalFmmConfig.h.cmake
${CMAKE_BINARY_DIR}/Src/ScalFmmConfig.h )
#
......
......@@ -15,7 +15,7 @@ SET(SCALFMM_PREFIX "@CMAKE_INSTALL_PREFIX@")
SET(SCALFMM_INCLUDES_DIR "@CMAKE_INSTALL_PREFIX@/include")
SET(SCALFMM_INCLUDES_ADD "@SCALFMM_INCLUDES@")
SET(SCALFMM_LIBRARIES_DIR "@CMAKE_INSTALL_PREFIX@/lib")
SET(SCALFMM_LIBRARIES_ADD "@SCALFMM_LIBRARIES@")
SET(SCALFMM_LIBRARIES_ADD "@SCALFMM_COMPILE_LIBS@")
SET(SCALFMM_LIBRARY_NAME "@scalfmm_lib@")
SET(ScaLFMM_CXX_FLAGS "@SCALFMM_CXX_FLAGS@")
#
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment