From: Andreas Fink <andreas.fink85@googlemail.com>
Date: Sat, 12 Jun 2010 07:45:16 +0000 (+0000)
Subject: *fix* do not set LDFLAGS to --as-needed because this changes building behaviour which... 
X-Git-Url: https://git.brokenzipper.com/gitweb?a=commitdiff_plain;h=43d45af5ea334bf2f235ec805831fae8d2528829;p=chaz%2Ftint2

*fix* do not set LDFLAGS to --as-needed because this changes building behaviour which the user is not aware of
*fix* link librt only if it is found (issue 261)
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e527a76..f4a628c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -10,6 +10,7 @@ pkg_check_modules( CAIRO REQUIRED cairo )
 pkg_check_modules( GLIB2 REQUIRED glib-2.0 )
 pkg_check_modules( GOBJECT2 REQUIRED gobject-2.0 )
 pkg_check_modules( IMLIB2 REQUIRED imlib2 )
+find_library( RT_LIBRARY rt )
 
 check_library_exists( "${IMLIB2_LIBRARIES}" "imlib_context_set_display" "${IMLIB2_LIBRARY_DIRS}" IMLIB_BUILD_WITH_X )
 if( NOT IMLIB_BUILD_WITH_X )
@@ -61,7 +62,6 @@ if( ENABLE_TINT2CONF )
   add_dependencies( tint2conf version )
 endif( ENABLE_TINT2CONF )
 
-
 set( MANDIR ${CMAKE_INSTALL_PREFIX}/share/man CACHE PATH "Directory for man pages" )
 set( DATADIR ${CMAKE_INSTALL_PREFIX}/share CACHE PATH "Directory for shared data" )
 set( SYSCONFDIR /etc CACHE PATH "Directory for configuration files" )
@@ -84,12 +84,14 @@ target_link_libraries( tint2 ${X11_LIBRARIES}
                              ${CAIRO_LIBRARIES}
                              ${GLIB2_LIBRARIES}
                              ${GOBJECT2_LIBRARIES}
-                             ${IMLIB2_LIBRARIES}
-                             rt )
+                             ${IMLIB2_LIBRARIES} )
+if( RT_LIBRARY )
+  target_link_libraries( tint2 ${RT_LIBRARY} )
+endif( RT_LIBRARY )
 
 add_dependencies(tint2 version)
 set_target_properties(tint2 PROPERTIES COMPILE_FLAGS -Wall)
-set_target_properties(tint2 PROPERTIES LINK_FLAGS -Wl,--as-needed)
+#set_target_properties(tint2 PROPERTIES LINK_FLAGS -Wl,--as-needed)
 
 install( TARGETS tint2 DESTINATION bin )
 install( FILES sample/tint2rc DESTINATION ${SYSCONFDIR}/xdg/tint2 )
diff --git a/src/tint2conf/CMakeLists.txt b/src/tint2conf/CMakeLists.txt
index 03b032b..382bbc3 100644
--- a/src/tint2conf/CMakeLists.txt
+++ b/src/tint2conf/CMakeLists.txt
@@ -29,7 +29,7 @@ target_link_libraries( tint2conf ${X11_LIBRARIES}
                                  ${GTK2_LIBRARIES} )
 
 set_target_properties(tint2conf PROPERTIES COMPILE_FLAGS -Wall)
-set_target_properties(tint2conf PROPERTIES LINK_FLAGS -Wl,--as-needed)
+#set_target_properties(tint2conf PROPERTIES LINK_FLAGS -Wl,--as-needed)
 
 install( TARGETS tint2conf DESTINATION bin )
 install( PROGRAMS tintwizard.py DESTINATION bin )