[kwallet-pam] /: Build for KWallet5 by default

Martin Klapetek mklapetek at kde.org
Wed Aug 5 13:54:41 BST 2015


Git commit 3abf505717170085d9c3c05b6e21e882911d5201 by Martin Klapetek.
Committed on 05/08/2015 at 12:54.
Pushed by mklapetek into branch 'master'.

Build for KWallet5 by default

Now it requires KWALLET4=1 to be passed to cmake to build the KWallet4
version, KWallet5 is built by default and does not require passing
anything now

CCMAIL: kde-distro-packagers at kde.org

M  +5    -4    CMakeLists.txt

http://commits.kde.org/kwallet-pam/3abf505717170085d9c3c05b6e21e882911d5201

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b8a44c..d7bdc4f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,11 +13,12 @@ include_directories (
    ${CMAKE_CURRENT_BINARY_DIR}
 )
 
-set(library_name "pam_kwallet")
+add_definitions(-DKWALLET5)
+set(library_name "pam_kwallet5")
 
-if ("${KWALLET5}" STREQUAL "1")
-    add_definitions(-DKWALLET5)
-    set(library_name "pam_kwallet5")
+if ("${KWALLET4}" STREQUAL "1")
+    remove_definitions(-DKWALLET5)
+    set(library_name "pam_kwallet")
 endif()
 
 set(pam_kwallet_SRCS



More information about the Distributions mailing list