X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=852b0d72dda377ba295345069d1fcc302c06b677;hb=702369fa1f89a638331e43543d83eb5db4c180ab;hp=f0b2131264eb6a9dc2d72281d7a545e5ee6c04dd;hpb=27912652c23d95ec0bb5440f89896f02a9df00d6;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f0b2131..852b0d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -18,9 +18,12 @@ PROJECT(creaImageIO)
 # The project version
 SET(PROJECT_MAJOR_VERSION 0)
 SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 5)
+SET(PROJECT_BUILD_VERSION 6)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
+# JPR 4 mars 2011
+set (CMAKE_MODULE_PATH ${CMAKE_INSTALL_PREFIX}/share/cmake/Module)
+
 #==================================
 # Find crea (mandatory, to use macros)
 FIND_PACKAGE(crea REQUIRED)
@@ -34,7 +37,6 @@ ENDIF(crea_FOUND)
 CREA_PREVENT_IN_SOURCE_BUILD()
 #==================================
 
-message("link directory ${GDCM_INCLUDE_DIR} ?!? ")
 
 # For boost 1.46 troubles...  // JPR.
 add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
@@ -42,7 +44,7 @@ add_definitions(-DBOOST_FILESYSTEM_VERSION=2)
 SET(USE_GDCM_VTK ON)
 
 SET(USE_VTK ON)
-SET(USE_ITK OFF)
+
 SET(USE_BOOST ON)
 OPTION(USE_WXWIDGETS "Use WxWidgets GUI" ON)
 OPTION(USE_QT4 "USE QT4GUI"       OFF)
@@ -73,6 +75,7 @@ IF(USE_GDCM2)
 	OPTION(USE_GDCM_ANOM "use gdcm2 anonymizer tool" OFF)
 	#TO DO TEST IF GDCM_USE_SYSTEM_OPENSSL is valid
 ENDIF(USE_GDCM2)
+OPTION(USE_ITK "use ITK" ON)
 CREA_FIND_AND_USE_LIBRARIES()
 
 SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR})
@@ -124,7 +127,9 @@ ENDIF(BUILD_CREA_PACS)
 
 ADD_SUBDIRECTORY(appli)
 ADD_SUBDIRECTORY(bbtk)
-ADD_SUBDIRECTORY(tests)
+
+#EED 31/05/2011   not compiling 
+#ADD_SUBDIRECTORY(tests)
 
 IF(MSVC AND CMAKE_SIZEOF_VOID_P MATCHES 4)
 	ADD_SUBDIRECTORY(win32)
@@ -136,4 +141,6 @@ endif()
 ADD_SUBDIRECTORY(install)
 #==================================
 
-ENABLE_TESTING()
+
+#EED 31/05/2011   not compiling 
+#ENABLE_TESTING()