X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=8e4eec37db26ab1e9ea1e6d409927ae448b4081c;hb=d9c32a7b27d8755c4859cc6558b88597035d9513;hp=3521361fb4d74d5c88c535946e90cd5c5f48e015;hpb=192dfdf774a06066eff90e9c50916723c8592706;p=creaContours.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 3521361..8e4eec3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,17 @@ -PROJECT(CreaContours) +CMAKE_MINIMUM_REQUIRED(VERSION 2.4) +#MARK_AS_ADVANCED( FORCE CMAKE_BACKWARDS_COMPATIBILITY ) + +# for CMake 2.6 corrected behaviour (see "cmake --help-policy CMP0003") +IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) + CMAKE_POLICY(SET CMP0003 NEW) + CMAKE_POLICY(SET CMP0005 NEW) +ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) + +PROJECT(creaContours) SET(PROJECT_MAJOR_VERSION 1) -SET(PROJECT_MINOR_VERSION 0) -SET(PROJECT_BUILD_VERSION 0) +SET(PROJECT_MINOR_VERSION 2) +SET(PROJECT_BUILD_VERSION 1) SET(CREA_VERBOSE_CMAKE TRUE) @@ -11,28 +20,33 @@ IF (crea_FOUND) INCLUDE(${crea_USE_FILE}) ENDIF(crea_FOUND) -FIND_PACKAGE(NDimensionsEnvironment REQUIRED) -IF (NDimensionsEnvironment_FOUND) - INCLUDE(${NDimensionsEnvironment_USE_FILE}) -ENDIF(NDimensionsEnvironment_FOUND) +FIND_PACKAGE(creaEnvironment REQUIRED) +IF (creaEnvironment_FOUND) + INCLUDE(${creaEnvironment_USE_FILE}) +ENDIF(creaEnvironment_FOUND) -FIND_PACKAGE(maracasVisuLib REQUIRED) -IF (maracasVisuLib_FOUND) - INCLUDE(${maracasVisuLib_USE_FILE}) -ENDIF(maracasVisuLib_FOUND) +FIND_PACKAGE(creaMaracasVisu REQUIRED) +IF (creaMaracasVisu_FOUND) + INCLUDE(${creaMaracasVisu_USE_FILE}) +ENDIF(creaMaracasVisu_FOUND) -FIND_PACKAGE(creaImageIO REQUIRED) -IF (creaImageIO_FOUND) - INCLUDE(${creaImageIO_USE_FILE}) -ENDIF(creaImageIO_FOUND) +#FIND_PACKAGE(creaImageIO REQUIRED) +#IF (creaImageIO_FOUND) +# INCLUDE(${creaImageIO_USE_FILE}) +#ENDIF(creaImageIO_FOUND) +FIND_PACKAGE(creaImageIO2 REQUIRED) +IF (creaImageIO2_FOUND) + INCLUDE(${creaImageIO2_USE_FILE}) +ENDIF(creaImageIO2_FOUND) -SET(USE_GDCM ON) -SET(USE_GDCM_VTK ON) + +SET(USE_GDCM OFF) +SET(USE_GDCM_VTK OFF) SET(USE_WXWIDGETS ON) SET(USE_VTK ON) -SET(USE_ITK OFF) -SET(USE_BOOST OFF) +SET(USE_ITK ON) +SET(USE_BOOST ON) CREA_FIND_AND_USE_LIBRARIES() @@ -54,6 +68,9 @@ INCLUDE_DIRECTORIES(lib/Interface_ManagerContour_NDimensions) INCLUDE_DIRECTORIES(lib/Interface_Icons_NDimensions) INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions) + SUBDIRS(lib) SUBDIRS(appli) SUBDIRS(bbtk) +SUBDIRS(data) +SUBDIRS(install)