summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-19 14:40:34 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-02-19 14:40:34 -0600
commit45f41ca57ecef2a51a19a8f61a953903421d3939 (patch)
tree7580c47def7e18edb722f320700ef2776f660f2f
parent0522d9d3a856c77220e1882e2d294cad6eb59772 (diff)
downloadtdebase-45f41ca57ecef2a51a19a8f61a953903421d3939.tar.gz
tdebase-45f41ca57ecef2a51a19a8f61a953903421d3939.zip
Use detected architecture flags for immediate symbol binding in kdesktop lock
-rw-r--r--ConfigureChecks.cmake2
-rw-r--r--kdesktop/lock/CMakeLists.txt4
2 files changed, 5 insertions, 1 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake
index 7be5f9baf..90d78be21 100644
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
@@ -9,6 +9,8 @@
#
#################################################
+tde_setup_architecture_flags( )
+
# termios.h (tdm, kioslave)
if( BUILD_TDM OR BUILD_KIOSLAVES )
check_include_file( termios.h HAVE_TERMIOS_H )
diff --git a/kdesktop/lock/CMakeLists.txt b/kdesktop/lock/CMakeLists.txt
index 7a351210b..caa655f59 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}
)