From 6830cb92f79a8c609342263b0f3edec7407f177d Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Sat, 11 Apr 2015 22:48:34 +0200 Subject: [PATCH] Update cmakelist of 3rdparties to qt5 --- 3rdparty/fancytabwidget/CMakeLists.txt | 2 +- 3rdparty/qocoa/CMakeLists.txt | 4 ++-- 3rdparty/qtiocompressor/CMakeLists.txt | 4 +++- 3rdparty/vreen/vreen/CMakeLists.txt | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/3rdparty/fancytabwidget/CMakeLists.txt b/3rdparty/fancytabwidget/CMakeLists.txt index bdc7b8e28..122f38a57 100644 --- a/3rdparty/fancytabwidget/CMakeLists.txt +++ b/3rdparty/fancytabwidget/CMakeLists.txt @@ -9,7 +9,7 @@ set(HEADERS fancytabwidget.h ) -qt4_wrap_cpp(MOC ${HEADERS}) +qt5_wrap_cpp(MOC ${HEADERS}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/3rdparty/qocoa/CMakeLists.txt b/3rdparty/qocoa/CMakeLists.txt index 92ac7ce29..b3b7fa4aa 100644 --- a/3rdparty/qocoa/CMakeLists.txt +++ b/3rdparty/qocoa/CMakeLists.txt @@ -6,7 +6,7 @@ set(HEADERS qprogressindicatorspinning.h ) -qt4_wrap_cpp(MOC_SOURCES ${HEADERS}) +qt5_wrap_cpp(MOC_SOURCES ${HEADERS}) if(APPLE) list(APPEND SOURCES @@ -23,7 +23,7 @@ else() set(RESOURCES qprogressindicatorspinning_nonmac.qrc ) - qt4_add_resources(RESOURCES_SOURCES ${RESOURCES}) + qt5_add_resources(RESOURCES_SOURCES ${RESOURCES}) endif() add_library(Qocoa STATIC diff --git a/3rdparty/qtiocompressor/CMakeLists.txt b/3rdparty/qtiocompressor/CMakeLists.txt index f339daba9..03578c554 100644 --- a/3rdparty/qtiocompressor/CMakeLists.txt +++ b/3rdparty/qtiocompressor/CMakeLists.txt @@ -8,9 +8,11 @@ set(IOCOMPRESSOR-MOC-HEADERS qtiocompressor.h ) -QT4_WRAP_CPP(IOCOMPRESSOR-SOURCES-MOC ${IOCOMPRESSOR-MOC-HEADERS}) +QT5_WRAP_CPP(IOCOMPRESSOR-SOURCES-MOC ${IOCOMPRESSOR-MOC-HEADERS}) ADD_LIBRARY(qtiocompressor STATIC ${IOCOMPRESSOR-SOURCES} ${IOCOMPRESSOR-SOURCES-MOC} ) + +QT5_USE_MODULES(qtiocompressor Core) diff --git a/3rdparty/vreen/vreen/CMakeLists.txt b/3rdparty/vreen/vreen/CMakeLists.txt index 80ddde319..44241581e 100644 --- a/3rdparty/vreen/vreen/CMakeLists.txt +++ b/3rdparty/vreen/vreen/CMakeLists.txt @@ -16,7 +16,7 @@ option(VREEN_WITH_EXAMPLES "Enable vreen tests" ON) option(VREEN_WITH_TESTS "Enable vreen examples" ON) option(VREEN_INSTALL_HEADERS "Install devel headers for vreen" ON) 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 set(RLIBDIR bin)