05.11., 9:00 - 11:00: Due to updates GitLab may be unavailable for some minutes between 09:00 and 11:00.

Fixed a set of obscure CMake policy warnings when using a newer version of CMake.

parent 3f6158f3
# = CAMPVis - Yet another medical visualization framework ===================== # = CAMPVis - Yet another medical visualization framework =====================
PROJECT(CAMPVis) PROJECT(CAMPVis)
CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR) CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2 FATAL_ERROR)
cmake_policy(SET CMP0020 NEW)
SET(CAMPVIS_VERSION 1.0.0) SET(CAMPVIS_VERSION 1.0.0)
......
PROJECT(campvis-application) PROJECT(campvis-application)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
INCLUDE(../cmake/commonconf.cmake) INCLUDE(../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring CAMPVis-Application") MESSAGE(STATUS "Configuring CAMPVis-Application")
...@@ -123,8 +122,7 @@ ADD_LIBRARY(campvis-application-lib ...@@ -123,8 +122,7 @@ ADD_LIBRARY(campvis-application-lib
) )
ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions} ${CampvisApplicationDefinitions}) ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions} ${CampvisApplicationDefinitions})
INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs} ${CampvisModulesIncludeDirs}) INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs} ${CampvisModulesIncludeDirs})
TARGET_LINK_LIBRARIES(campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs}) TARGET_LINK_LIBRARIES(campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs} Qt5::Widgets Qt5::OpenGL)
qt5_use_modules(campvis-application-lib Widgets OpenGL)
# if campvis-core is built as a shared library, CMake will define the following flag to instruct # if campvis-core is built as a shared library, CMake will define the following flag to instruct
# the code to export DLL symbols # the code to export DLL symbols
...@@ -140,9 +138,7 @@ INSTALL(TARGETS campvis-application-lib DESTINATION exports EXPORT campvis-targe ...@@ -140,9 +138,7 @@ INSTALL(TARGETS campvis-application-lib DESTINATION exports EXPORT campvis-targe
ADD_EXECUTABLE(campvis-application "campvis.cpp") ADD_EXECUTABLE(campvis-application "campvis.cpp")
TARGET_LINK_LIBRARIES(campvis-application campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs}) TARGET_LINK_LIBRARIES(campvis-application campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs} Qt5::Widgets Qt5::OpenGL)
qt5_use_modules(campvis-application Widgets OpenGL)
IF(CAMPVIS_DEPLOY_SHADERS) IF(CAMPVIS_DEPLOY_SHADERS)
LIST(APPEND CampvisShaderDirectories "application/data") LIST(APPEND CampvisShaderDirectories "application/data")
......
...@@ -11,8 +11,9 @@ set(CAMPVIS_INCLUDE_DIRS "@CampvisGlobalIncludeDirs@;@CampvisModulesIncludeDirs@ ...@@ -11,8 +11,9 @@ set(CAMPVIS_INCLUDE_DIRS "@CampvisGlobalIncludeDirs@;@CampvisModulesIncludeDirs@
SET(CAMPVIS_DEFINITIONS @CampvisGlobalDefinitions@) SET(CAMPVIS_DEFINITIONS @CampvisGlobalDefinitions@)
FIND_PACKAGE(Qt4 ${CampvisRequiredQtVersion} REQUIRED QtCore QtGui QtOpenGL) FIND_PACKAGE(Qt5Widgets REQUIRED)
INCLUDE(${QT_USE_FILE}) FIND_PACKAGE(Qt5OpenGL REQUIRED)
RESOLVE_QT5_DLL_LOCATIONS("Core;Gui;OpenGL;Widgets")
SET(CGT_WITH_QT true) SET(CGT_WITH_QT true)
# Our library dependencies (contains definitions for IMPORTED targets) # Our library dependencies (contains definitions for IMPORTED targets)
......
PROJECT(campvis-core) PROJECT(campvis-core)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
INCLUDE(../cmake/commonconf.cmake) INCLUDE(../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring CAMPVis-Core") MESSAGE(STATUS "Configuring CAMPVis-Core")
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
# Project file for the cgt library # Project file for the cgt library
################################################################################ ################################################################################
PROJECT(cgt) PROJECT(cgt)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
INCLUDE(../../cmake/commonconf.cmake) INCLUDE(../../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring cgt Library") MESSAGE(STATUS "Configuring cgt Library")
...@@ -79,9 +78,7 @@ ENDIF(CGT_WITH_QT) ...@@ -79,9 +78,7 @@ ENDIF(CGT_WITH_QT)
ADD_LIBRARY(cgt ${CGT_SOURCES} ${CGT_HEADERS}) ADD_LIBRARY(cgt ${CGT_SOURCES} ${CGT_HEADERS})
ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions}) ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions})
INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs} ${CampvisModulesIncludeDirs}) INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs} ${CampvisModulesIncludeDirs})
TARGET_LINK_LIBRARIES(cgt ${CampvisGlobalExternalLibs}) TARGET_LINK_LIBRARIES(cgt ${CampvisGlobalExternalLibs} Qt5::Widgets Qt5::OpenGL)
qt5_use_modules(cgt Widgets OpenGL)
# if CGT is built as a shared library, CMake will define the following flag to instruct the code to # if CGT is built as a shared library, CMake will define the following flag to instruct the code to
# export DLL symbols # export DLL symbols
......
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
# Project file for the sigslot library # Project file for the sigslot library
################################################################################ ################################################################################
PROJECT(sigslot) PROJECT(sigslot)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
MESSAGE(STATUS "Configuring sigslot Library") MESSAGE(STATUS "Configuring sigslot Library")
# headers # headers
......
PROJECT(campvis-modules) PROJECT(campvis-modules)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
#INCLUDE(../cmake/commonconf.cmake)
MESSAGE(STATUS "Configuring CAMPVis-Modules") MESSAGE(STATUS "Configuring CAMPVis-Modules")
LIST(APPEND CampvisModulesHeaders LIST(APPEND CampvisModulesHeaders
......
PROJECT(campvis-scripting) PROJECT(campvis-scripting)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
MESSAGE(STATUS "Configuring CAMPVis-Scripting") MESSAGE(STATUS "Configuring CAMPVis-Scripting")
# SWIG # SWIG
......
PROJECT(campvis-test) PROJECT(campvis-test)
CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
MESSAGE(STATUS "Configuring CAMPVis Test") MESSAGE(STATUS "Configuring CAMPVis Test")
FILE(GLOB TestCampvisHeaders RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} FILE(GLOB TestCampvisHeaders RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment