[Pkg-owncloud-commits] [qtkeychain] 05/63: Enabled static builds on Windows.

[Sandro Knauß]

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

hefee pushed a commit to branch master
in repository qtkeychain.

commit 0786ed673071b4d7f10d3a09f0ae36ce521b45b0
Author: dgb <dgb at DGBES.local>
Date:   Wed Apr 6 10:32:55 2016 +0200

    Enabled static builds on Windows.
---
 .gitignore     | 7 +++++++
 CMakeLists.txt | 3 ++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index e8d9d35..a015f29 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,11 +30,18 @@ Makefile
 libqt5keychain.*
 testclient
 
+#Windows build files
+install_manifest.txt
+*.manifest
+*.lib
+*.exe
+
 #Mac build files
 qtkeychain.xcodeproj
 qtkeychain.build
 
 #Temporary files
 *.sw?
+*~
 
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 551db5f..f65233d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -164,7 +164,7 @@ if(NOT QTKEYCHAIN_STATIC)
     target_link_libraries(${QTKEYCHAIN_TARGET_NAME} ${qtkeychain_LIBRARIES})
 else()
     add_library(${QTKEYCHAIN_TARGET_NAME} STATIC ${qtkeychain_SOURCES} ${qtkeychain_MOC_OUTFILES} ${qtkeychain_QM_FILES})
-    set_target_properties(${QTKEYCHAIN_TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS QKEYCHAIN_STATICLIB)
+    set_target_properties(${QTKEYCHAIN_TARGET_NAME} PROPERTIES COMPILE_DEFINITIONS QKEYCHAIN_STATICLIB )
 endif()
 
 set_target_properties(${QTKEYCHAIN_TARGET_NAME} PROPERTIES
@@ -187,6 +187,7 @@ install(TARGETS ${QTKEYCHAIN_TARGET_NAME}
 
 add_executable( testclient testclient.cpp )
 target_link_libraries( testclient ${QTKEYCHAIN_TARGET_NAME} ${qtkeychain_LIBRARIES})
+set_target_properties( testclient PROPERTIES COMPILE_DEFINITIONS QKEYCHAIN_STATICLIB )
 
 
 ###

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