Fixed a set of obscure CMake policy warnings when using a newer version of CMake. (a4b588c4) · Commits · CAMP / campvis-public

CMakeLists.txt

+2 −1

Original line number	Diff line number	Diff line
		# = CAMPVis - Yet another medical visualization framework =====================
		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)

+2 −6

Original line number	Diff line number	Diff line
		PROJECT(campvis-application)
		CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
		INCLUDE(../cmake/commonconf.cmake)

		MESSAGE(STATUS "Configuring CAMPVis-Application")
		@@ -123,8 +122,7 @@ ADD_LIBRARY(campvis-application-lib
		)
		ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions} ${CampvisApplicationDefinitions})
		INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs} ${CampvisModulesIncludeDirs})
		TARGET_LINK_LIBRARIES(campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs})
		qt5_use_modules(campvis-application-lib Widgets OpenGL)
		TARGET_LINK_LIBRARIES(campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs} Qt5::Widgets Qt5::OpenGL)

		# if campvis-core is built as a shared library, CMake will define the following flag to instruct
		# the code to export DLL symbols
		@@ -140,9 +138,7 @@ INSTALL(TARGETS campvis-application-lib DESTINATION exports EXPORT campvis-targe


		ADD_EXECUTABLE(campvis-application "campvis.cpp")
		TARGET_LINK_LIBRARIES(campvis-application campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs})
		qt5_use_modules(campvis-application Widgets OpenGL)

		TARGET_LINK_LIBRARIES(campvis-application campvis-application-lib ${CampvisMainLibs} ${CampvisGlobalExternalLibs} ${CampvisModulesExternalLibs} Qt5::Widgets Qt5::OpenGL)

		IF(CAMPVIS_DEPLOY_SHADERS)
		LIST(APPEND CampvisShaderDirectories "application/data")

+3 −2

Original line number	Diff line number	Diff line
		@@ -11,8 +11,9 @@ set(CAMPVIS_INCLUDE_DIRS "@CampvisGlobalIncludeDirs@;@CampvisModulesIncludeDirs@

		SET(CAMPVIS_DEFINITIONS @CampvisGlobalDefinitions@)

		FIND_PACKAGE(Qt4 ${CampvisRequiredQtVersion} REQUIRED QtCore QtGui QtOpenGL)
		INCLUDE(${QT_USE_FILE})
		FIND_PACKAGE(Qt5Widgets REQUIRED)
		FIND_PACKAGE(Qt5OpenGL REQUIRED)
		RESOLVE_QT5_DLL_LOCATIONS("Core;Gui;OpenGL;Widgets")
		SET(CGT_WITH_QT true)

		# Our library dependencies (contains definitions for IMPORTED targets)

+0 −1

Original line number	Diff line number	Diff line
		PROJECT(campvis-core)
		CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
		INCLUDE(../cmake/commonconf.cmake)

		MESSAGE(STATUS "Configuring CAMPVis-Core")

+1 −4

Original line number	Diff line number	Diff line
		@@ -2,7 +2,6 @@
		# Project file for the cgt library
		################################################################################
		PROJECT(cgt)
		CMAKE_MINIMUM_REQUIRED(VERSION 2.8.0 FATAL_ERROR)
		INCLUDE(../../cmake/commonconf.cmake)

		MESSAGE(STATUS "Configuring cgt Library")
		@@ -79,9 +78,7 @@ ENDIF(CGT_WITH_QT)
		ADD_LIBRARY(cgt ${CGT_SOURCES} ${CGT_HEADERS})
		ADD_DEFINITIONS(${CampvisGlobalDefinitions} ${CampvisModulesDefinitions})
		INCLUDE_DIRECTORIES(${CampvisGlobalIncludeDirs} ${CampvisModulesIncludeDirs})
		TARGET_LINK_LIBRARIES(cgt ${CampvisGlobalExternalLibs})

		qt5_use_modules(cgt Widgets OpenGL)
		TARGET_LINK_LIBRARIES(cgt ${CampvisGlobalExternalLibs} Qt5::Widgets Qt5::OpenGL)

		# if CGT is built as a shared library, CMake will define the following flag to instruct the code to
		# export DLL symbols