Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
campvis-public
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
9
Issues
9
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
1
Merge Requests
1
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
CAMP
campvis-public
Commits
a4b588c4
Commit
a4b588c4
authored
Jan 20, 2016
by
Christian Schulte zu Berge
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed a set of obscure CMake policy warnings when using a newer version of CMake.
parent
3f6158f3
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
8 additions
and
22 deletions
+8
-22
CMakeLists.txt
CMakeLists.txt
+2
-1
application/CMakeLists.txt
application/CMakeLists.txt
+2
-6
cmake/CAMPVisConfig.cmake.in
cmake/CAMPVisConfig.cmake.in
+3
-2
core/CMakeLists.txt
core/CMakeLists.txt
+0
-1
ext/cgt/CMakeLists.txt
ext/cgt/CMakeLists.txt
+1
-4
ext/sigslot/CMakeLists.txt
ext/sigslot/CMakeLists.txt
+0
-2
modules/CMakeLists.txt
modules/CMakeLists.txt
+0
-3
scripting/CMakeLists.txt
scripting/CMakeLists.txt
+0
-2
test/CMakeLists.txt
test/CMakeLists.txt
+0
-1
No files found.
CMakeLists.txt
View file @
a4b588c4
# = 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
)
...
...
application/CMakeLists.txt
View file @
a4b588c4
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"
)
...
...
cmake/CAMPVisConfig.cmake.in
View file @
a4b588c4
...
...
@@ -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)
...
...
core/CMakeLists.txt
View file @
a4b588c4
PROJECT
(
campvis-core
)
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.0 FATAL_ERROR
)
INCLUDE
(
../cmake/commonconf.cmake
)
MESSAGE
(
STATUS
"Configuring CAMPVis-Core"
)
...
...
ext/cgt/CMakeLists.txt
View file @
a4b588c4
...
...
@@ -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
...
...
ext/sigslot/CMakeLists.txt
View file @
a4b588c4
...
...
@@ -2,8 +2,6 @@
# Project file for the sigslot library
################################################################################
PROJECT
(
sigslot
)
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.0 FATAL_ERROR
)
MESSAGE
(
STATUS
"Configuring sigslot Library"
)
# headers
...
...
modules/CMakeLists.txt
View file @
a4b588c4
PROJECT
(
campvis-modules
)
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.0 FATAL_ERROR
)
#INCLUDE(../cmake/commonconf.cmake)
MESSAGE
(
STATUS
"Configuring CAMPVis-Modules"
)
LIST
(
APPEND CampvisModulesHeaders
...
...
scripting/CMakeLists.txt
View file @
a4b588c4
PROJECT
(
campvis-scripting
)
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.0 FATAL_ERROR
)
MESSAGE
(
STATUS
"Configuring CAMPVis-Scripting"
)
# SWIG
...
...
test/CMakeLists.txt
View file @
a4b588c4
PROJECT
(
campvis-test
)
CMAKE_MINIMUM_REQUIRED
(
VERSION 2.8.0 FATAL_ERROR
)
MESSAGE
(
STATUS
"Configuring CAMPVis Test"
)
FILE
(
GLOB TestCampvisHeaders RELATIVE
${
CMAKE_CURRENT_SOURCE_DIR
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment