зеркало из https://github.com/nextcloud/desktop.git
More removal of obsolete CMake code
This commit is contained in:
Родитель
7f836cc01b
Коммит
dafd9c308f
|
@ -133,8 +133,6 @@ if(BUILD_OWNCLOUD_OSX_BUNDLE)
|
||||||
install(FILES resources/owncloud_logo_blue.png DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
|
install(FILES resources/owncloud_logo_blue.png DESTINATION ${OWNCLOUD_OSX_BUNDLE}/Contents/Resources/)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include(OwnCloudCPack.cmake)
|
|
||||||
|
|
||||||
add_definitions(-DUNICODE)
|
add_definitions(-DUNICODE)
|
||||||
add_definitions(-D_UNICODE)
|
add_definitions(-D_UNICODE)
|
||||||
if( WIN32 )
|
if( WIN32 )
|
||||||
|
|
|
@ -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})
|
qt5_use_modules(${APPLICATION_EXECUTABLE} Widgets Network Xml WebKitWidgets Sql ${ADDITIONAL_APP_MODULES})
|
||||||
elseif(NOT BUILD_LIBRARIES_ONLY)
|
elseif(NOT BUILD_LIBRARIES_ONLY)
|
||||||
set(BIN_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}")
|
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(CMAKE_INSTALL_PREFIX ".") # Examples use /Applications. hurmpf.
|
||||||
set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
|
set(MACOSX_BUNDLE_ICON_FILE "ownCloud.icns")
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче