Commit df40af82 authored by Jean-Loup Haberbusch's avatar 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
......@@ -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
......
#--------------------------------------------
# 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})
......
Supports Markdown
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