[Pkg-owncloud-commits] [qtkeychain] 03/63: Adapted .gitignore to Linux and made it possible to find Qt5 in custom location.

[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 0b509afc0fb61bd4ff9a88098f8b00413f1962a2
Author: Kristofer Tingdahl <kristofer at tingdahl.net>
Date:   Tue Apr 5 16:15:17 2016 +0200

    Adapted .gitignore to Linux and made it possible to find
    Qt5 in custom location.
---
 .gitignore     | 25 ++++++++++++++++++++-----
 CMakeLists.txt |  6 ++++++
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index eba3155..e8d9d35 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,20 +2,33 @@
 CMakeCache.txt
 CMakeFiles
 CMakeScripts
+cmake_install.cmake
+
+#Keychain temporary files
+Qt5KeychainBuildTreeSettings.cmake
+Qt5KeychainConfig.cmake
+Qt5KeychainConfigVersion.cmake
 QtKeychainBuildTreeSettings.cmake
 QtKeychainConfig.cmake
 QtKeychainConfigVersion.cmake
-cmake_install.cmake
+kwallet_interface.cpp
+kwallet_interface.h
+kwallet_interface.moc
+moc_keychain.*
+moc_keychain_p.*
 
 #Qt files
-moc_keychain.cxx
-moc_keychain.cxx_parameters
-moc_keychain_p.cxx
-moc_keychain_p.cxx_parameters
+*_parameters
+*.qm
 
 #General build files
 Debug
 Release
+Makefile
+
+#Linux build files
+libqt5keychain.*
+testclient
 
 #Mac build files
 qtkeychain.xcodeproj
@@ -23,3 +36,5 @@ qtkeychain.build
 
 #Temporary files
 *.sw?
+
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c10005e..f276349 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,12 @@ if (WIN32)
 endif()
 
 if( NOT BUILD_WITH_QT4 )
+
+    #Make it possible to point out where the QT is installed
+    if ( QTDIR ) 
+	list ( APPEND CMAKE_PREFIX_PATH ${QTDIR} )
+    endif( QTDIR )
+
     # try Qt5 first, and prefer that if found
     find_package(Qt5Core QUIET)
 endif()

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