X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=857728b9e4eb8bff2bfdf1574c7d7061370a0343;hb=6dc7534dff25fd12b882ac520c4befdbaf9d4709;hp=51e48a686018cb3d5c0a3a99d0a99863bd878420;hpb=286cbf55bbd817ef8c9827d07fb231f945a77a89;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 51e48a6..857728b 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,10 +15,11 @@ ENDIF(crea_FOUND)
 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_WXWIDGETS ON)
 
 CREA_FIND_AND_USE_LIBRARIES()
 
@@ -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,7 @@ ELSE (BUILD_V2)
 ENDIF (BUILD_V2)
 
 
-OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" OFF)
+OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON)
 
 IF (BUILD_CREA_BRUKER)
 	FIND_PACKAGE(creaBruker REQUIRED)
@@ -65,7 +66,15 @@ IF (BUILD_CREA_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)