X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=2c5ded1b9bacfca45d696b4b9a5b408cdf003393;hb=93692028fda538964e7ce2216e08b04d600b7a5e;hp=221a8e48974ebaf1ca215b55081b056e4b9f0d67;hpb=7cbaed9c7b7fcc2a5b8ab1d82ba27797c76df455;p=creaImageIO.git

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 221a8e4..2c5ded1 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 2)
 SET(CREA_VERBOSE_CMAKE TRUE)
 
 FIND_PACKAGE(crea REQUIRED)
@@ -30,18 +30,42 @@ 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?" OFF)
+
+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)
+
+#
 SUBDIRS(appli)
 SUBDIRS(bbtk)
 SUBDIRS(install)