X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=7d4de8923a68f2a37bf9078befd21d8e28046183;hb=978f699b97794e209f9d20e2a33a72404bda54ef;hp=cad43283bd4964cd5badc5de099936fe96483427;hpb=2d43f5c8ae2004242af2297ceb2926d81675548f;p=gdcm.git diff --git a/CMakeLists.txt b/CMakeLists.txt index cad43283..7d4de892 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 1.8) #----------------------------------------------------------------------------- # GDCM version number, usefull for packaging and doxygen doc: SET(GDCM_MAJOR_VERSION 0) -SET(GDCM_MINOR_VERSION 6) +SET(GDCM_MINOR_VERSION 7) SET(GDCM_BUILD_VERSION 0) SET(GDCM_VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}") @@ -30,8 +30,8 @@ MARK_AS_ADVANCED(LIBRARY_OUTPUT_PATH EXECUTABLE_OUTPUT_PATH) #----------------------------------------------------------------------------- # Build directory on which many applications depend SUBDIRS( - src Dicts + src ) #----------------------------------------------------------------------------- # Example subdir: @@ -58,9 +58,8 @@ INCLUDE (${CMAKE_ROOT}/Modules/CMakeBackwardCompatibilityCXX.cmake) IF(CMAKE_NO_ANSI_STRING_STREAM) SET(GDCM_NO_ANSI_STRING_STREAM 1) ENDIF(CMAKE_NO_ANSI_STRING_STREAM) -IF(${CMAKE_WORDS_BIGENDIAN}) - SET(GDCM_WORDS_BIGENDIAN 1) -ENDIF(${CMAKE_WORDS_BIGENDIAN}) +INCLUDE (${CMAKE_ROOT}/Modules/TestBigEndian.cmake) +TEST_BIG_ENDIAN(GDCM_WORDS_BIGENDIAN) INCLUDE (${CMAKE_ROOT}/Modules/CheckIncludeFile.cmake) CHECK_INCLUDE_FILE("stdint.h" CMAKE_HAVE_STDINT_H) @@ -89,7 +88,7 @@ IF(GDCM_VTK) FIND_PACKAGE(VTK) # If vtk found IF(VTK_FOUND) - INCLUDE(${VTK_USE_FILE}) + #INCLUDE(${VTK_USE_FILE}) SUBDIRS(vtk) ENDIF(VTK_FOUND) ENDIF(GDCM_VTK)