diff options
| author | Fabio Rossi <rossi.f@inwind.it> | 2018-12-17 17:07:38 +0100 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2018-12-18 23:47:06 +0900 |
| commit | 7d8d7f102a6c17a7a8ceb2082e19c3f742a6c91e (patch) | |
| tree | 776ca64d1b86ef80b7f537ce168240a445099f37 | |
| parent | 23d192de8b8f5661032be0b3db98074328cef929 (diff) | |
| download | tdelibs-7d8d7f102a6c17a7a8ceb2082e19c3f742a6c91e.tar.gz tdelibs-7d8d7f102a6c17a7a8ceb2082e19c3f742a6c91e.zip | |
Avoid overriding user linker flags (LDFLAGS) for modules and shared libs
Signed-off-by: Fabio Rossi <rossi.f@inwind.it>
(cherry picked from commit d8177b405849215646b5c2524a1ec1df245301ff)
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | libtdescreensaver/CMakeLists.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index b74e4b86b..ec1725026 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1166,8 +1166,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 9846efdcf..b39777ec2 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} |