diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-02-19 14:40:34 -0600 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2012-06-03 03:26:54 +0200 |
| commit | ff91f3f28fd55154fa39fa5f2f1228f532ce6f3c (patch) | |
| tree | 4a6e740d5e5b715ba54e74bd93ef88a051cdbe00 | |
| parent | c9f7957083907b9e4c3fd12e9b6ef44f4812c704 (diff) | |
| download | tdebase-ff91f3f28fd55154fa39fa5f2f1228f532ce6f3c.tar.gz tdebase-ff91f3f28fd55154fa39fa5f2f1228f532ce6f3c.zip | |
Use detected architecture flags for immediate symbol binding in kdesktop lock
(cherry picked from commit 45f41ca57ecef2a51a19a8f61a953903421d3939)
| -rw-r--r-- | ConfigureChecks.cmake | 2 | ||||
| -rw-r--r-- | kdesktop/lock/CMakeLists.txt | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 41ede62f4..af7f22d47 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -9,6 +9,8 @@ # ################################################# +tde_setup_architecture_flags( ) + # termios.h (kdm, kioslave) if( BUILD_KDM OR BUILD_KIOSLAVES ) check_include_file( termios.h HAVE_TERMIOS_H ) diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt index 7093e476a..b7a32e996 100644 --- a/kdesktop/lock/CMakeLists.txt +++ b/kdesktop/lock/CMakeLists.txt @@ -2,6 +2,8 @@ # # (C) 2010-2011 Serghei Amelian # serghei (DOT) amelian (AT) gmail.com +# (C) 2012 Timothy Pearson +# kb9vqf (AT) pearsoncomputing.net # # Improvements and feedback are welcome # @@ -35,6 +37,6 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY} "-z\ now" + LINK kdesktopsettings-static dmctl-static kio-shared Xext ${GL_LIBRARY} "${LINKER_IMMEDIATE_BINDING_FLAGS}" DESTINATION ${BIN_INSTALL_DIR} ) |