Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
solverstack
ScalFMM
Commits
3764cbfd
Commit
3764cbfd
authored
May 20, 2015
by
BRAMAS Berenger
Browse files
change the format of the variable that contains the lib (and lib path) in the config file
parent
63d50460
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
3764cbfd
...
...
@@ -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
)
#
...
...
ScalFMMConfig.cmake.in
View file @
3764cbfd
...
...
@@ -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_
LIBRARIE
S@")
SET(SCALFMM_LIBRARIES_ADD "@SCALFMM_
COMPILE_LIB
S@")
SET(SCALFMM_LIBRARY_NAME "@scalfmm_lib@")
SET(ScaLFMM_CXX_FLAGS "@SCALFMM_CXX_FLAGS@")
#
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment