X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=857728b9e4eb8bff2bfdf1574c7d7061370a0343;hb=e79fb1c492e93cdd1a5a95ba0ab491b868cf5992;hp=2d27f2d9433e0d883594142f7259fa040bb9e315;hpb=3e44acb4a0963c9fb97d135820048fda3cf9ebd9;p=creaImageIO.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 2d27f2d..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 2) +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() @@ -55,7 +56,7 @@ ELSE (BUILD_V2) ENDIF (BUILD_V2) -OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" OFF) +OPTION(BUILD_CREA_BRUKER "Build creaIRM with creaBruker?" ON) IF (BUILD_CREA_BRUKER) FIND_PACKAGE(creaBruker REQUIRED) @@ -75,4 +76,5 @@ ENDIF(BUILD_CREA_PACS) # SUBDIRS(appli) SUBDIRS(bbtk) +SUBDIRS(win32) SUBDIRS(install)