[Pkg-owncloud-commits] [qtkeychain] 19/115: Finish cmake port to osx

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Mar 15 19:25:43 UTC 2014


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

hefee-guest pushed a commit to branch master
in repository qtkeychain.

commit d74b2c2cd6c0e9bc23f475c65a2301d9cbfb083d
Author: Dominik Schmidt <dev at dominik-schmidt.de>
Date:   Mon Apr 30 15:03:36 2012 +0200

    Finish cmake port to osx
---
 CMakeLists.txt | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 11bb113..a5c553b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,16 +5,25 @@ project(qtkeychain)
 find_package(Qt4 COMPONENTS QtCore REQUIRED)
 include_directories(${QT_INCLUDES})
 
+list(APPEND qtkeychain_LIBRARIES ${QT_QTCORE_LIBRARY})
 set(qtkeychain_SOURCES
     keychain.cpp
 )
 
+
 if(WIN32)
     list(APPEND qtkeychain_SOURCES keychain_win.cpp)
+    list(APPEND qtkeychain_LIBRARIES crypt32)
 endif()
 
 if(APPLE)
     list(APPEND qtkeychain_SOURCES keychain_mac.cpp)
+
+    find_library(COREFOUNDATION_LIBRARY CoreFoundation)
+    list(APPEND qtkeychain_LIBRARIES ${COREFOUNDATION_LIBRARY})
+
+    find_library(SECURITY_LIBRARY Security)
+    list(APPEND qtkeychain_LIBRARIES ${SECURITY_LIBRARY})
 endif()
 
 if(UNIX AND NOT APPLE)
@@ -24,10 +33,7 @@ endif()
 if(NOT QTKEYCHAIN_STATIC)
     add_library(qtkeychain SHARED ${qtkeychain_SOURCES})
     set_target_properties(qtkeychain PROPERTIES COMPILE_DEFINITIONS QKEYCHAIN_BUILD_QKEYCHAIN_LIB)
-    target_link_libraries(qtkeychain ${QT_QTCORE_LIBRARY})
-    if(WIN32)
-        target_link_libraries(qtkeychain crypt32)
-    endif()
+    target_link_libraries(qtkeychain ${qtkeychain_LIBRARIES} )
 else()
     add_library(qtkeychain STATIC ${qtkeychain_SOURCES})
 endif()
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/qtkeychain.git



More information about the Pkg-owncloud-commits mailing list