X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=CMakeLists.txt;h=728923a4f4f0127b4c3741800e75e815cdc1114b;hb=187506872b6e67d60ebbe8ada94834443dbb293a;hp=f87b10431ad4afa9110215de42160747bccae8be;hpb=7d0479304b904f27272d0464952c54d2bf4a3809;p=gdcm.git diff --git a/CMakeLists.txt b/CMakeLists.txt index f87b1043..728923a4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,7 +5,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.0) #----------------------------------------------------------------------------- # GDCM version number, usefull for packaging and doxygen doc: SET(GDCM_MAJOR_VERSION 1) -SET(GDCM_MINOR_VERSION 2) +SET(GDCM_MINOR_VERSION 3) SET(GDCM_BUILD_VERSION 0) SET(GDCM_VERSION "${GDCM_MAJOR_VERSION}.${GDCM_MINOR_VERSION}.${GDCM_BUILD_VERSION}") @@ -96,14 +96,14 @@ IF("GDCM_TEST_ISTRINGSTREAM" MATCHES "^GDCM_TEST_ISTRINGSTREAM$") ${GDCM_SOURCE_DIR}/CMake/gdcmTestIstringStream.cxx) IF(GDCM_TEST_ISTRINGSTREAM_COMPILED) IF(GDCM_TEST_ISTRINGSTREAM) - MESSAGE(STATUS "Checking signedness of char -- signed") - SET(GDCM_TEST_ISTRINGSTREAM 1 CACHE INTERNAL "Whether char is signed.") + MESSAGE(STATUS "Checking istringstream works -- yes") + SET(GDCM_TEST_ISTRINGSTREAM 1 CACHE INTERNAL "Whether istringstream works.") ELSE(GDCM_TEST_ISTRINGSTREAM) - MESSAGE(STATUS "Checking signedness of char -- unsigned") - SET(GDCM_TEST_ISTRINGSTREAM 0 CACHE INTERNAL "Whether char is signed.") + MESSAGE(STATUS "Checking istringstream works -- no") + SET(GDCM_TEST_ISTRINGSTREAM 0 CACHE INTERNAL "Whether istringstream works.") ENDIF(GDCM_TEST_ISTRINGSTREAM) ELSE(GDCM_TEST_ISTRINGSTREAM_COMPILED) - MESSAGE(STATUS "Checking signedness of char -- failed") + MESSAGE(STATUS "Checking istringstream -- failed") ENDIF(GDCM_TEST_ISTRINGSTREAM_COMPILED) ENDIF("GDCM_TEST_ISTRINGSTREAM" MATCHES "^GDCM_TEST_ISTRINGSTREAM$") @@ -189,7 +189,7 @@ IF( ${CMAKE_HAVE_SYS_SOCKET_H} ) FILE(WRITE ${GDCM_BINARY_DIR}/CMakeTmp/gdcmTestHAVESALEN.c "${POUND}include \n" "${POUND}include \n" - "int main() { struct sockaddr sa; sa.sa_len = 0; }") + "int main() { struct sockaddr sa; sa.sa_len = 0; }\n") MESSAGE(STATUS "Checking if ifreq has a sa_len") TRY_COMPILE(HAVE_SA_LEN ${GDCM_BINARY_DIR}