Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
CamiTK
CamiTK Community Edition
Commits
df40af82
Commit
df40af82
authored
Jul 26, 2016
by
Jean-Loup Haberbusch
Browse files
Merge branch 'hotfix-4.0.2' into develop
Conflicts: CMakeLists.txt sdk/cmake/modules/macros/camitk/CamiTKExtension.cmake
parents
234e1071
94cb834d
Changes
2
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
df40af82
...
...
@@ -16,7 +16,7 @@ set(CAMITK_PROJECT_NAME "CamiTK")
set
(
CAMITK_VERSION_MAJOR
"4"
)
set
(
CAMITK_VERSION_MINOR
"1"
)
set
(
CAMITK_VER_NICKNAME
"burgundy"
)
# Red Burgundy Amaranth Rose Auburn Cardinal Carmine Cerise Coquelicot Bordeaux
set
(
CAMITK_VERSION_PATCH
"
0
"
)
# patch version for packaging, change when appropriate
set
(
CAMITK_VERSION_PATCH
"
2
"
)
# patch version for packaging, change when appropriate
string
(
TOLOWER
"
${
CAMITK_PROJECT_NAME
}
-
${
CAMITK_VERSION_MAJOR
}
.
${
CAMITK_VERSION_MINOR
}
"
CAMITK_SHORT_VERSION_STRING
)
# Specific to SDK: this is the SDK build
...
...
sdk/libraries/cepgenerator/resources/cep.CMakeLists.txt.in
View file @
df40af82
#--------------------------------------------
# CamiTK Extension Project
#--------------------------------------------
cmake_minimum_required(VERSION
2.6
)
cmake_minimum_required(VERSION
3.0
)
# Find CamiTK SDK
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR})
...
...
Write
Preview
Supports
Markdown
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