X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=67a94c5188cb91157c498246e09256438d774864;hb=681242bb0257173c8aad6d9ad010c65574019bee;hp=dc4a57d6fb196852c9f377804d97f9a4b9517bdc;hpb=c6c81af149bb0f0bd9f4c14cb2e276d7eb046b7d;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dc4a57d..67a94c5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ PROJECT(creaImageIO)
 
 SET(PROJECT_MAJOR_VERSION 0)
 SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 1)
+SET(PROJECT_BUILD_VERSION 3)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -15,7 +15,8 @@ ENDIF(crea_FOUND)
 SET(USE_GDCM ON)
 #SET(USE_GDCM2 ON)
 SET(USE_GDCM_VTK ON)
-SET(USE_WXWIDGETS ON)
+
+OPTION(USE_WXWIDGETS "Build creaImageIO with WxWidgets ?" ON) 
 SET(USE_VTK ON)
 SET(USE_ITK OFF)
 SET(USE_BOOST ON)
@@ -36,7 +37,7 @@ LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 ENDIF(WIN32)
 
 
-OPTION(BUILD_V2 "Build Version 2 ?" OFF) 
+OPTION(BUILD_V2 "Build Version 2 ?" ON) 
 
 IF (BUILD_V2)
   SET(LIBNAME creaImageIO2)
@@ -55,7 +56,25 @@ ELSE (BUILD_V2)
 ENDIF (BUILD_V2)
 
 
+OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON)
+
+IF (BUILD_CREA_BRUKER)
+	FIND_PACKAGE(creaBruker REQUIRED)
+	IF (creaBruker_FOUND)
+		INCLUDE(${creaBruker_USE_FILE})
+		CREA_DEFINE(BUILD_BRUKER)
+	ENDIF(creaBruker_FOUND)
+ENDIF (BUILD_CREA_BRUKER)
+
+
+# To Use PACS connection library
+OPTION(BUILD_CREA_PACS "Build creaImageIO with PACS connection library ?" OFF)
+IF (BUILD_CREA_PACS)
+	CREA_DEFINE(BUILD_PACS)
+ENDIF(BUILD_CREA_PACS)
+
 #
 SUBDIRS(appli)
 SUBDIRS(bbtk)
+SUBDIRS(win32)
 SUBDIRS(install)