X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=5076630e8344783665642439f2633a49254be48b;hb=5c51e157c5f506ceac760bdc90f4b73943395539;hp=860cad4b376d943b7c14d320c2085e6cc3a0505d;hpb=5844b74c6fe4f586454a7a118e0e101e4e58ab18;p=creaContours.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 860cad4..5076630 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,40 +7,46 @@ IF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VER CMAKE_POLICY(SET CMP0005 NEW) ENDIF(COMMAND cmake_policy AND ${CMAKE_MAJOR_VERSION} EQUAL 2 AND ${CMAKE_MINOR_VERSION} GREATER 4) -PROJECT(CreaContours) +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,7 +69,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)