From 868fbb84a0aad702a964580a5d44304f9abbfcf4 Mon Sep 17 00:00:00 2001 From: Matt Williams Date: Sun, 9 Mar 2014 18:02:24 +0000 Subject: [PATCH] Update to use Qt5 The examples and tests now use Qt5. This allows some nice tidying of the CMake files, some of which will come in future. Closes issue #41 --- CMakeLists.txt | 22 +++++++--------- examples/Basic/CMakeLists.txt | 4 +-- examples/OpenGL/CMakeLists.txt | 2 +- examples/Paging/CMakeLists.txt | 4 +-- examples/SmoothLOD/CMakeLists.txt | 4 +-- tests/CMakeLists.txt | 43 ++++++++++++++----------------- 6 files changed, 33 insertions(+), 46 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6691be4a..ef7af1f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,18 +43,14 @@ IF(WIN32) ENDIF() # Qt is required for building the tests, the example and optionally for bundling the documentation -FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtOpenGL QtTest) -INCLUDE(${QT_USE_FILE}) -if(CMAKE_VERSION VERSION_LESS "2.8.6") - set_package_info(Doxygen "API documentation generator" http://www.doxygen.org "Building the API documentation") - set_package_info(Qt4 "C++ framework" http://qt-project.org "Building the examples and tests") -else() - set_package_properties(Doxygen PROPERTIES URL http://www.doxygen.org DESCRIPTION "API documentation generator" TYPE OPTIONAL PURPOSE "Building the API documentation") - set_package_properties(Qt4 PROPERTIES DESCRIPTION "C++ framework" URL http://qt-project.org) - set_package_properties(Qt4 PROPERTIES TYPE RECOMMENDED PURPOSE "Building the examples") - set_package_properties(Qt4 PROPERTIES TYPE OPTIONAL PURPOSE "Building the tests") -endif() +find_package(Qt5Test 5.2 REQUIRED) +find_package(Qt5OpenGL 5.2 REQUIRED) +set_package_properties(Doxygen PROPERTIES URL http://www.doxygen.org DESCRIPTION "API documentation generator" TYPE OPTIONAL PURPOSE "Building the API documentation") +set_package_properties(Qt5Test PROPERTIES DESCRIPTION "C++ framework" URL http://qt-project.org) +set_package_properties(Qt5Test PROPERTIES TYPE OPTIONAL PURPOSE "Building the tests") +set_package_properties(Qt5OpenGL PROPERTIES DESCRIPTION "C++ framework" URL http://qt-project.org) +set_package_properties(Qt5OpenGL PROPERTIES TYPE RECOMMENDED PURPOSE "Building the examples") IF(CMAKE_COMPILER_IS_GNUCXX) #Maybe "OR MINGW" ADD_DEFINITIONS(-std=c++0x) #Enable C++0x mode @@ -66,7 +62,7 @@ endif() ADD_SUBDIRECTORY(library) OPTION(ENABLE_EXAMPLES "Should the examples be built" ON) -IF(ENABLE_EXAMPLES AND QT_QTOPENGL_FOUND) +IF(ENABLE_EXAMPLES AND Qt5OpenGL_FOUND) ADD_SUBDIRECTORY(examples/common) ADD_SUBDIRECTORY(examples/Basic) ADD_SUBDIRECTORY(examples/Paging) @@ -81,7 +77,7 @@ ENDIF() INCLUDE(Packaging.cmake) OPTION(ENABLE_TESTS "Should the tests be built" ON) -IF(ENABLE_TESTS AND QT_QTTEST_FOUND) +IF(ENABLE_TESTS AND Qt5Test_FOUND) INCLUDE(CTest) MARK_AS_ADVANCED(FORCE BUILD_TESTING) ADD_SUBDIRECTORY(tests) diff --git a/examples/Basic/CMakeLists.txt b/examples/Basic/CMakeLists.txt index 02e203d2..e0328805 100644 --- a/examples/Basic/CMakeLists.txt +++ b/examples/Basic/CMakeLists.txt @@ -19,8 +19,6 @@ # 3. This notice may not be removed or altered from any source # distribution. -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - PROJECT(BasicExample) #Projects source files @@ -52,7 +50,7 @@ ADD_EXECUTABLE(BasicExample ${SRC_FILES}) IF(MSVC) SET_TARGET_PROPERTIES(BasicExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) -TARGET_LINK_LIBRARIES(BasicExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +TARGET_LINK_LIBRARIES(BasicExample glew Qt5::OpenGL ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) SET_PROPERTY(TARGET BasicExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows diff --git a/examples/OpenGL/CMakeLists.txt b/examples/OpenGL/CMakeLists.txt index 5cd1ed55..32709e81 100644 --- a/examples/OpenGL/CMakeLists.txt +++ b/examples/OpenGL/CMakeLists.txt @@ -60,7 +60,7 @@ ADD_EXECUTABLE(OpenGLExample ${SRC_FILES}) IF(MSVC) SET_TARGET_PROPERTIES(OpenGLExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) -TARGET_LINK_LIBRARIES(OpenGLExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +TARGET_LINK_LIBRARIES(OpenGLExample glew Qt5::OpenGL ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) SET_PROPERTY(TARGET OpenGLExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows diff --git a/examples/Paging/CMakeLists.txt b/examples/Paging/CMakeLists.txt index e8020b2d..97cec53a 100644 --- a/examples/Paging/CMakeLists.txt +++ b/examples/Paging/CMakeLists.txt @@ -19,8 +19,6 @@ # 3. This notice may not be removed or altered from any source # distribution. -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - PROJECT(PagingExample) #Projects source files @@ -54,7 +52,7 @@ ADD_EXECUTABLE(PagingExample ${SRC_FILES}) IF(MSVC) SET_TARGET_PROPERTIES(PagingExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") ENDIF(MSVC) -TARGET_LINK_LIBRARIES(PagingExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +TARGET_LINK_LIBRARIES(PagingExample glew Qt5::OpenGL ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) SET_PROPERTY(TARGET PagingExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows diff --git a/examples/SmoothLOD/CMakeLists.txt b/examples/SmoothLOD/CMakeLists.txt index 570cda55..9c5649fc 100644 --- a/examples/SmoothLOD/CMakeLists.txt +++ b/examples/SmoothLOD/CMakeLists.txt @@ -19,8 +19,6 @@ # 3. This notice may not be removed or altered from any source # distribution. -CMAKE_MINIMUM_REQUIRED(VERSION 2.6) - PROJECT(SmoothLODExample) #Projects source files @@ -52,7 +50,7 @@ ADD_EXECUTABLE(SmoothLODExample ${SRC_FILES}) IF(MSVC) SET_TARGET_PROPERTIES(SmoothLODExample PROPERTIES COMPILE_FLAGS "/W4 /wd4127") #All warnings ENDIF(MSVC) -TARGET_LINK_LIBRARIES(SmoothLODExample glew ${QT_LIBRARIES} ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) +TARGET_LINK_LIBRARIES(SmoothLODExample glew Qt5::OpenGL ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} PolyVoxCore) SET_PROPERTY(TARGET SmoothLODExample PROPERTY FOLDER "Examples") #Install - Only install the example in Windows diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index fbffe9d9..6b06437b 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -24,12 +24,14 @@ # # Also sets LATEST_TEST to point to the output executable of the test for easy # ADD_TEST()ing -MACRO(CREATE_TEST headerfile sourcefile executablename) + +set(CMAKE_AUTOMOC TRUE) + +MACRO(CREATE_TEST sourcefile executablename) UNSET(test_moc_SRCS) #clear out the MOCs from previous tests - QT4_WRAP_CPP(test_moc_SRCS ${headerfile}) LINK_DIRECTORIES(${PolyVoxCore_BINARY_DIR} ${PolyVoxUtil_BINARY_DIR}) ADD_EXECUTABLE(${executablename} ${sourcefile} ${test_moc_SRCS}) - TARGET_LINK_LIBRARIES(${executablename} PolyVoxCore PolyVoxUtil ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY}) + TARGET_LINK_LIBRARIES(${executablename} PolyVoxCore PolyVoxUtil Qt5::Test) #HACK. This is needed since everything is built in the base dir in Windows. As of 2.8 we should change this. IF(WIN32) SET(LATEST_TEST ${EXECUTABLE_OUTPUT_PATH}/${executablename}) @@ -46,22 +48,17 @@ MACRO(CREATE_TEST headerfile sourcefile executablename) ENDMACRO(CREATE_TEST) INCLUDE_DIRECTORIES(${PolyVoxCore_BINARY_DIR}/include ${PolyVox_SOURCE_DIR}/PolyVoxCore/include ${CMAKE_CURRENT_BINARY_DIR}) -REMOVE_DEFINITIONS(-DQT_GUI_LIB) #Make sure the tests don't link to the QtGui # Test Template. Copy and paste this template for consistant naming. # # ClassName tests -# CREATE_TEST(TestClassName.h TestClassName.cpp TestClassName) +# CREATE_TEST(TestClassName.cpp TestClassName) # ADD_TEST(ClassNameFeature1Test ${LATEST_TEST} testFeature1) # ADD_TEST(ClassNameFeature2Test ${LATEST_TEST} testFeature2) # Python tests IF(BUILD_BINDINGS) FIND_PACKAGE(PythonInterp 3) - IF(CMAKE_VERSION VERSION_LESS "2.8.6") - set_package_info(PythonInterp "Python Interpereter" http://www.python.org "Running the Python tests") - ELSE() - set_package_properties(PythonInterp PROPERTIES URL http://www.python.org DESCRIPTION "Python Interpereter" TYPE OPTIONAL PURPOSE "Running the Python tests") - ENDIF() + set_package_properties(PythonInterp PROPERTIES URL http://www.python.org DESCRIPTION "Python Interpereter" TYPE OPTIONAL PURPOSE "Running the Python tests") IF(PYTHONINTERP_FOUND) ADD_TEST(PythonSurfaceExtractorTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/TestSurfaceExtractor.py) ADD_TEST(PythonRaycastTest ${PYTHON_EXECUTABLE} ${CMAKE_CURRENT_SOURCE_DIR}/TestRaycast.py) @@ -69,38 +66,38 @@ IF(BUILD_BINDINGS) ENDIF() # AmbientOcclusionGenerator tests -CREATE_TEST(TestAmbientOcclusionGenerator.h TestAmbientOcclusionGenerator.cpp TestAmbientOcclusionGenerator) +CREATE_TEST(TestAmbientOcclusionGenerator.cpp TestAmbientOcclusionGenerator) # Array tests -CREATE_TEST(TestArray.h TestArray.cpp TestArray) +CREATE_TEST(TestArray.cpp TestArray) # AStarPathfinder tests -CREATE_TEST(TestAStarPathfinder.h TestAStarPathfinder.cpp TestAStarPathfinder) +CREATE_TEST(TestAStarPathfinder.cpp TestAStarPathfinder) -CREATE_TEST(TestCubicSurfaceExtractor.h TestCubicSurfaceExtractor.cpp TestCubicSurfaceExtractor) +CREATE_TEST(TestCubicSurfaceExtractor.cpp TestCubicSurfaceExtractor) # Low pass filter tests -CREATE_TEST(TestLowPassFilter.h TestLowPassFilter.cpp TestLowPassFilter) +CREATE_TEST(TestLowPassFilter.cpp TestLowPassFilter) # Material tests -CREATE_TEST(testmaterial.h testmaterial.cpp testmaterial) +CREATE_TEST(testmaterial.cpp testmaterial) # Raycast tests -CREATE_TEST(TestRaycast.h TestRaycast.cpp TestRaycast) +CREATE_TEST(TestRaycast.cpp TestRaycast) # Picking tests -CREATE_TEST(TestPicking.h TestPicking.cpp TestPicking) +CREATE_TEST(TestPicking.cpp TestPicking) # Region tests -CREATE_TEST(TestRegion.h TestRegion.cpp TestRegion) +CREATE_TEST(TestRegion.cpp TestRegion) -CREATE_TEST(TestSurfaceExtractor.h TestSurfaceExtractor.cpp TestSurfaceExtractor) +CREATE_TEST(TestSurfaceExtractor.cpp TestSurfaceExtractor) #Vector tests -CREATE_TEST(testvector.h testvector.cpp testvector) +CREATE_TEST(testvector.cpp testvector) # Volume tests -CREATE_TEST(testvolume.h testvolume.cpp testvolume) +CREATE_TEST(testvolume.cpp testvolume) # Volume subclass tests -CREATE_TEST(TestVolumeSubclass.h TestVolumeSubclass.cpp TestVolumeSubclass) +CREATE_TEST(TestVolumeSubclass.cpp TestVolumeSubclass)