X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=7f0be56e8e1f2f69b3fc6f7b3503e3993cf71d18;hb=da652993c65aeadf5fdddc623dc2f342321c4fba;hp=74700d18c581464cf62805389d173959000cfe9f;hpb=1105d4fa1829853319070b3d5144eec7e12b246b;p=creaContours.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 74700d1..7f0be56 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -10,44 +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 2) 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) -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 OFF) -SET(USE_GDCM_VTK ON) +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()