summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabio Rossi <rossi.f@inwind.it>2018-12-17 17:07:38 +0100
committerFabio Rossi <rossi.f@inwind.it>2018-12-17 17:07:38 +0100
commitd8177b405849215646b5c2524a1ec1df245301ff (patch)
tree7e3cecf6600d84b27994210bbda2700a5eb25dfc
parentb7788884cb42e04a10942b6a5331aaef72e6648b (diff)
downloadtdelibs-d8177b405849215646b5c2524a1ec1df245301ff.zip
tdelibs-d8177b405849215646b5c2524a1ec1df245301ff.tar.gz
Avoid overriding user linker flags (LDFLAGS) for modules and shared libs
Signed-off-by: Fabio Rossi <rossi.f@inwind.it>
-rw-r--r--CMakeLists.txt4
-rw-r--r--libtdescreensaver/CMakeLists.txt2
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aab7b64..3291a70 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1250,8 +1250,8 @@ add_definitions(
)
set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${TQT_CXX_FLAGS}" )
-set( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
-set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
+set( CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--no-undefined" )
+set( CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--no-undefined" )
##### headers ###################################
diff --git a/libtdescreensaver/CMakeLists.txt b/libtdescreensaver/CMakeLists.txt
index 9846efd..b39777e 100644
--- a/libtdescreensaver/CMakeLists.txt
+++ b/libtdescreensaver/CMakeLists.txt
@@ -17,7 +17,7 @@ include_directories(
${CMAKE_SOURCE_DIR}/tdecore
)
-list( REMOVE_ITEM CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined" )
+string( REPLACE "-Wl,--no-undefined" "" CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS}" )
link_directories(
${TDECORE_LIBRARY_DIRS}