X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;ds=sidebyside;f=CMakeLists.txt;h=c7cfe9ce95de0b5471b1326181dbc9850965d356;hb=0c9434689ec3efd286c941f8d018155d52879003;hp=66c9894cf4daaf4ddd570e376ba75293ce5bed6f;hpb=684add23b4f64cb3c6e39e12a4af20d2c2500df6;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 66c9894..c7cfe9c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,28 +1,27 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+
 PROJECT(creaImageIO)
 
-SET(crea_VERBOSE_FIND_LIBRARY TRUE)
+SET(PROJECT_MAJOR_VERSION 0)
+SET(PROJECT_MINOR_VERSION 2)
+SET(PROJECT_BUILD_VERSION 0)
+
+SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
 IF (crea_FOUND)
   INCLUDE(${crea_USE_FILE})
 ENDIF(crea_FOUND)
 
-crea_DEFINE( MY_DEFINITION )
-crea_DEFINE_WITH_VAL( MY_OTHER_DEFINITION TOTO)
-
-
-SET(PROJECT_MAJOR_VERSION 1)
-SET(PROJECT_MINOR_VERSION 0)
-SET(PROJECT_BUILD_VERSION 0)
-
 SET(USE_GDCM ON)
+#SET(USE_GDCM2 ON)
 SET(USE_GDCM_VTK ON)
 SET(USE_WXWIDGETS ON)
 SET(USE_VTK ON)
+SET(USE_ITK OFF)
 SET(USE_BOOST ON)
-SET(USE_SQLITE3 ON)
 
-INCLUDE(${crea_CMAKE_DIR}/FindAndUseLibraries.cmake)
+CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
 SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -45,5 +44,5 @@ ENDIF(WIN32)
 
 SUBDIRS(src)
 SUBDIRS(appli)
-#SUBDIRS(bbtk)
-
+SUBDIRS(bbtk)
+SUBDIRS(install)