X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=5532c133afe3f14ecfeb21a53feb6c72b3188729;hb=d53268f864234f0ee96f1b705a7786c094480e32;hp=c7cfe9ce95de0b5471b1326181dbc9850965d356;hpb=f222981341cf668b7bc13eda3faff36444ea0aab;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c7cfe9c..5532c13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,8 +4,7 @@ PROJECT(creaImageIO)
 
 SET(PROJECT_MAJOR_VERSION 0)
 SET(PROJECT_MINOR_VERSION 2)
-SET(PROJECT_BUILD_VERSION 0)
-
+SET(PROJECT_BUILD_VERSION 3)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -16,7 +15,7 @@ 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)
@@ -31,18 +30,50 @@ MARK_AS_ADVANCED(
   LIBRARY_OUTPUT_PATH
   )
 
-# Includes 
-INCLUDE_DIRECTORIES(
-#  ${PROJECT_BINARY_DIR}
-  ${PROJECT_SOURCE_DIR}/src
-  )
-
 IF(WIN32)
 INCLUDE_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 LINK_DIRECTORIES(${PROJECT_SOURCE_DIR}/win32)
 ENDIF(WIN32)
 
-SUBDIRS(src)
+
+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
+    )
+  SUBDIRS(src)
+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)