X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=dc3a5a26256b298bee48f9d9b27e21b5ebd83e44;hb=5235c979f94063e3c311b354fdff165701504652;hp=eda72b30bb4d1151623d298aa6b7b2942c229b8f;hpb=1cf60614f73e5906f22c6d13f3e62b4325e1f433;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index eda72b3..dc3a5a2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,10 @@
+CMAKE_MINIMUM_REQUIRED(VERSION 2.4)
+
 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)
@@ -12,6 +13,7 @@ IF (crea_FOUND)
 ENDIF(crea_FOUND)
 
 SET(USE_GDCM ON)
+#SET(USE_GDCM2 ON)
 SET(USE_GDCM_VTK ON)
 SET(USE_WXWIDGETS ON)
 SET(USE_VTK ON)
@@ -28,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)