Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Update cmakelist of 3rdparties to qt5

This commit is contained in:
Chocobozzz 2015-04-11 22:48:34 +02:00
parent 39f120d405
commit 6830cb92f7
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/fancytabwidget/CMakeLists.txt vendored
View File

@ -9,7 +9,7 @@ set(HEADERS
fancytabwidget.h fancytabwidget.h
) )
qt4_wrap_cpp(MOC ${HEADERS}) qt5_wrap_cpp(MOC ${HEADERS})
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR})

4
3rdparty/qocoa/CMakeLists.txt vendored
View File

@ -6,7 +6,7 @@ set(HEADERS
qprogressindicatorspinning.h qprogressindicatorspinning.h
) )
qt4_wrap_cpp(MOC_SOURCES ${HEADERS}) qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
if(APPLE) if(APPLE)
list(APPEND SOURCES list(APPEND SOURCES
@ -23,7 +23,7 @@ else()
set(RESOURCES set(RESOURCES
qprogressindicatorspinning_nonmac.qrc qprogressindicatorspinning_nonmac.qrc
) )
qt4_add_resources(RESOURCES_SOURCES ${RESOURCES}) qt5_add_resources(RESOURCES_SOURCES ${RESOURCES})
endif() endif()
add_library(Qocoa STATIC add_library(Qocoa STATIC

4
3rdparty/qtiocompressor/CMakeLists.txt vendored
View File

@ -8,9 +8,11 @@ set(IOCOMPRESSOR-MOC-HEADERS
qtiocompressor.h qtiocompressor.h
) )
QT4_WRAP_CPP(IOCOMPRESSOR-SOURCES-MOC ${IOCOMPRESSOR-MOC-HEADERS}) QT5_WRAP_CPP(IOCOMPRESSOR-SOURCES-MOC ${IOCOMPRESSOR-MOC-HEADERS})
ADD_LIBRARY(qtiocompressor STATIC ADD_LIBRARY(qtiocompressor STATIC
${IOCOMPRESSOR-SOURCES} ${IOCOMPRESSOR-SOURCES}
${IOCOMPRESSOR-SOURCES-MOC} ${IOCOMPRESSOR-SOURCES-MOC}
) )
QT5_USE_MODULES(qtiocompressor Core)

2
3rdparty/vreen/vreen/CMakeLists.txt vendored
View File

@ -16,7 +16,7 @@ option(VREEN_WITH_EXAMPLES "Enable vreen tests" ON)
option(VREEN_WITH_TESTS "Enable vreen examples" ON) option(VREEN_WITH_TESTS "Enable vreen examples" ON)
option(VREEN_INSTALL_HEADERS "Install devel headers for vreen" ON) option(VREEN_INSTALL_HEADERS "Install devel headers for vreen" ON)
option(VREEN_DEVELOPER_BUILD "Install devel headers for vreen" OFF) option(VREEN_DEVELOPER_BUILD "Install devel headers for vreen" OFF)
option(USE_QT5 "Build with Qt 5" OFF) option(USE_QT5 "Build with Qt 5" ON)
#TODO check if vars is defined #TODO check if vars is defined
set(RLIBDIR bin) set(RLIBDIR bin)