X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=857728b9e4eb8bff2bfdf1574c7d7061370a0343;hb=da2cb2feea7bdf425151ea3fd71abf9b8b72c366;hp=8a97a2ebaf01ccac81131fddc3941779b70fcd2f;hpb=cbf693fa62cd51f4ca5c881838bbb609edc447b0;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8a97a2e..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,15 +37,17 @@ 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)
   INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/src2
     )
   SUBDIRS(src2)
 ELSE (BUILD_V2)
+  SET(LIBNAME creaImageIO)
   INCLUDE_DIRECTORIES(
     ${PROJECT_BINARY_DIR}
     ${PROJECT_SOURCE_DIR}/src
@@ -53,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)