X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=2c5ded1b9bacfca45d696b4b9a5b408cdf003393;hb=a67d921cdc10d438852b48c2985f14d91320e016;hp=dc4a57d6fb196852c9f377804d97f9a4b9517bdc;hpb=c6c81af149bb0f0bd9f4c14cb2e276d7eb046b7d;p=creaImageIO.git diff --git a/CMakeLists.txt b/CMakeLists.txt index dc4a57d..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) @@ -36,7 +36,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,6 +55,16 @@ ELSE (BUILD_V2) 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)