[Pkg-owncloud-commits] [owncloud-client] 189/219: More removal of obsolete CMake code

Sandro Knauß hefee-guest at moszumanska.debian.org
Sat Oct 11 14:43:25 UTC 2014


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

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

commit dafd9c308fef47530654dccdf4d063cea24a5ba5
Author: Daniel Molkentin <danimo at owncloud.com>
Date:   Wed Oct 1 12:51:29 2014 +0200

    More removal of obsolete CMake code
---
 CMakeLists.txt     | 2 --
 src/CMakeLists.txt | 6 ------
 2 files changed, 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cdd27d3..283d229 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -133,8 +133,6 @@ if(BUILD_OWNCLOUD_OSX_BUNDLE)
     install(FILES resources/owncloud_logo_blue.png DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
 endif()
 
-include(OwnCloudCPack.cmake)
-
 add_definitions(-DUNICODE)
 add_definitions(-D_UNICODE)
 if( WIN32 )
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 4a00d9f..b96b6c4 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -359,12 +359,6 @@ if(NOT BUILD_OWNCLOUD_OSX_BUNDLE AND NOT BUILD_LIBRARIES_ONLY)
     qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
 elseif(NOT BUILD_LIBRARIES_ONLY)
     set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
-    if (Qt5Core_FOUND)
-        include(DeployQt5)
-    else(Qt5Core_FOUND)
-        include(DeployQt4)
-    endif(Qt5Core_FOUND)
-
     set(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
     set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
 

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



More information about the Pkg-owncloud-commits mailing list