chylex/Nextcloud-Desktop
1
0
Fork 0
mirror of https://github.com/chylex/Nextcloud-Desktop.git synced 2025-04-09 19:15:43 +02:00
Code

Build on mac with Qt 5

Browse Source 
I still had this patch on disk.
This commit is contained in:
Daniel Molkentin 2013-11-19 14:41:32 +01:00
parent e551e92e13
commit 5c4d240c66
2 changed files with 8 additions and 1 deletions

7
cmake/modules/QtVersionAbstraction.cmake
View File

@ -57,6 +57,9 @@ if( NOT BUILD_WITH_QT4 )
qt5_wrap_cpp(${ARGN})
endmacro()
macro(install_qt_executable)
install_qt5_executable(${ARGN})
endmacro()
macro(setup_qt)
endmacro()
@ -105,6 +108,10 @@ if( NOT Qt5Core_DIR )
qt4_wrap_cpp(${ARGN})
endmacro()
macro(install_qt_executable)
install_qt4_executable(${ARGN})
endmacro()
macro(setup_qt)
set(QT_USE_QTGUI TRUE)
set(QT_USE_QTSQL TRUE)

2
src/CMakeLists.txt
View File

@ -365,7 +365,7 @@ install(TARGETS ${APPLICATION_EXECUTABLE}
# currently it needs to be done because the code right above needs to be executed no matter
# if building a bundle or not and the install_qt4_executable needs to be called afterwards
if(BUILD_OWNCLOUD_OSX_BUNDLE)
install_qt4_executable(${OWNCLOUD_OSX_BUNDLE} "qsqlite" "" ${dirs})
install_qt_executable(${OWNCLOUD_OSX_BUNDLE} "qsqlite" "" ${dirs})
endif()
find_program(KRAZY2_EXECUTABLE krazy2)