X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=5076630e8344783665642439f2633a49254be48b;hb=952a38fa3f2d03c663e76463cca9ead7904c9e14;hp=d52fad965c872c60ac98a47c9aed076427d1a4b5;hpb=9e9314adadbca535d733e1593e61122c31bc0d7b;p=creaContours.git diff --git a/CMakeLists.txt b/CMakeLists.txt index d52fad9..5076630 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,33 +10,29 @@ ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_ 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) -message("EED creaContour " "01") FIND_PACKAGE(crea REQUIRED) IF (crea_FOUND) INCLUDE(${crea_USE_FILE}) ENDIF(crea_FOUND) -message("EED creaContour " "02") FIND_PACKAGE(creaEnvironment REQUIRED) IF (creaEnvironment_FOUND) INCLUDE(${creaEnvironment_USE_FILE}) ENDIF(creaEnvironment_FOUND) -message("EED creaContour " "03") FIND_PACKAGE(creaMaracasVisu REQUIRED) IF (creaMaracasVisu_FOUND) INCLUDE(${creaMaracasVisu_USE_FILE}) ENDIF(creaMaracasVisu_FOUND) -message("EED creaContour " "04") FIND_PACKAGE(creaImageIO REQUIRED) IF (creaImageIO_FOUND) @@ -44,19 +40,16 @@ IF (creaImageIO_FOUND) ENDIF(creaImageIO_FOUND) -message("EED creaContour " "05") SET(USE_GDCM OFF) SET(USE_GDCM_VTK ON) SET(USE_WXWIDGETS ON) SET(USE_VTK ON) -SET(USE_ITK OFF) +SET(USE_ITK ON) SET(USE_BOOST OFF) -message("EED creaContour " "05.1") CREA_FIND_AND_USE_LIBRARIES() -message("EED creaContour " "05.2") SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}) SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}) @@ -71,13 +64,11 @@ INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32) LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32) ENDIF(WIN32) -message("EED creaContour " "06") INCLUDE_DIRECTORIES(lib/Interface_ManagerContour_NDimensions) INCLUDE_DIRECTORIES(lib/Interface_Icons_NDimensions) INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions) -message("EED creaContour " "07") SUBDIRS(lib) SUBDIRS(appli)