X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=857728b9e4eb8bff2bfdf1574c7d7061370a0343;hb=011c2f926836abae60e9a525f819f9a66f03fac1;hp=931f7e59093da3f29b77d15efd041672004794e9;hpb=7ca5b25a73bb296c395c810af83332d8af1eed1c;p=creaImageIO.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 931f7e5..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) @@ -70,9 +71,10 @@ ENDIF (BUILD_CREA_BRUKER) OPTION(BUILD_CREA_PACS "Build creaImageIO with PACS connection library ?" OFF) IF (BUILD_CREA_PACS) CREA_DEFINE(BUILD_PACS) -ENDIF(BUID_CREA_PACS) +ENDIF(BUILD_CREA_PACS) # SUBDIRS(appli) SUBDIRS(bbtk) +SUBDIRS(win32) SUBDIRS(install)