--- ray/CMakeLists.txt 2014/04/18 20:51:49 1.12 +++ ray/CMakeLists.txt 2016/03/22 21:36:24 1.17 @@ -1,6 +1,16 @@ cmake_minimum_required(VERSION 2.8.4) project("radiance") +if(NOT ${CMAKE_VERSION} VERSION_LESS "2.8.11") + cmake_policy(SET CMP0020 NEW) + if(NOT ${CMAKE_VERSION} VERSION_LESS "3.0") + cmake_policy(SET CMP0042 NEW) + if(NOT ${CMAKE_VERSION} VERSION_LESS "3.1") + cmake_policy(SET CMP0054 NEW) + endif() + endif() +endif() + enable_testing() include(CTest) @@ -65,9 +75,9 @@ IF( BUILD_PACKAGE ) INCLUDE(radianceCPack.cmake ) ENDIF( BUILD_PACKAGE ) -set(CPACK_PACKAGE_VERSION_MAJOR 4) -set(CPACK_PACKAGE_VERSION_MINOR 2) -set(CPACK_PACKAGE_VERSION_PATCH a) +set(CPACK_PACKAGE_VERSION_MAJOR 5) +set(CPACK_PACKAGE_VERSION_MINOR 0) +set(CPACK_PACKAGE_VERSION_PATCH a.8) set(CPACK_PACKAGE_INSTALL_DIRECTORY "Radiance") SET(CPACK_RESOURCE_FILE_WELCOME "${radiance_SOURCE_DIR}/Welcome.txt") SET(CPACK_RESOURCE_FILE_README "${radiance_SOURCE_DIR}/README.txt") @@ -77,7 +87,7 @@ SET(CPACK_RESOURCE_FILE_LICENSE "${radiance_SOURCE_DIR include(CPack) if(NOT BUILD_HEADLESS) - find_package(Qt4 COMPONENTS QtCore QtGui) + find_package(Qt5Widgets) find_package(X11) endif()