[Xfce4-commits] [panel-plugins/xfce4-whiskermenu-plugin] 118/473: BUILD: don't overwrite env ldflags and make as-needed optional

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

gottcode pushed a commit to branch master
in repository panel-plugins/xfce4-whiskermenu-plugin.

commit 504888759e8f30ee6c2919e31a4c77056a562367
Author: hasufell <julian.ospald at googlemail.com>
Date:   Thu Jul 18 14:36:21 2013 +0200

    BUILD: don't overwrite env ldflags and make as-needed optional
---
 CMakeLists.txt     |    1 +
 src/CMakeLists.txt |    4 +++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85fe977..1a51d8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ project(whiskermenu)
 
 # options
 option(ENABLE_WERROR "Enable -Werror flag for development" OFF)
+option(ENABLE_AS_NEEDED "Enable -Wl,--as-needed for the linker" ON)
 
 include(GNUInstallDirs)
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 8f3a294..0290931 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -4,7 +4,9 @@ if(ENABLE_WERROR)
 endif()
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${WHISKERMENU_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden ${WHISKERMENU_FLAGS}")
-set(CMAKE_SHARED_LINKER_FLAGS "-Wl,--as-needed")
+if(ENABLE_AS_NEEDED)
+	set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--as-needed")
+endif()
 
 find_package(GTK2 REQUIRED)
 find_package(PkgConfig REQUIRED)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.