X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=5076630e8344783665642439f2633a49254be48b;hb=952a38fa3f2d03c663e76463cca9ead7904c9e14;hp=acc3b33cbe61624c4202a2583a0b02fb20272b9e;hpb=6e3c929c883c405e0075fa8df10b12a935979367;p=creaContours.git diff --git a/CMakeLists.txt b/CMakeLists.txt index acc3b33..5076630 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,37 +10,43 @@ 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) + FIND_PACKAGE(crea REQUIRED) IF (crea_FOUND) INCLUDE(${crea_USE_FILE}) ENDIF(crea_FOUND) + FIND_PACKAGE(creaEnvironment REQUIRED) IF (creaEnvironment_FOUND) INCLUDE(${creaEnvironment_USE_FILE}) ENDIF(creaEnvironment_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) -SET(USE_GDCM ON) + + +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) CREA_FIND_AND_USE_LIBRARIES() @@ -63,6 +69,7 @@ INCLUDE_DIRECTORIES(lib/Interface_ManagerContour_NDimensions) INCLUDE_DIRECTORIES(lib/Interface_Icons_NDimensions) INCLUDE_DIRECTORIES(lib/kernel_ManagerContour_NDimensions) + SUBDIRS(lib) SUBDIRS(appli) SUBDIRS(bbtk)