[Gdcm-hackers] gdcm-git:Grassroots DICOM branch master updated. b233ba08f07488f555feadec5599119ba3de736f

[Mathieu M. <ma...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Grassroots DICOM".

The branch, master has been updated
       via  b233ba08f07488f555feadec5599119ba3de736f (commit)
      from  28508b82afad3bb270428afff701f788e7ff6a6b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://sourceforge.net/p/gdcm/gdcm/ci/b233ba08f07488f555feadec5599119ba3de736f/

commit b233ba08f07488f555feadec5599119ba3de736f
Author: Mathieu Malaterre <mat...@gm...>
Date:   Thu Apr 25 12:42:29 2019 +0200

    Remove explicit c++11 requirement
    
    Remove explicit setting of standard c++ version to c++11.
    A user is now able to compile with another c++ standard version (higher
    than c++11). Simply expose which features of the standard are required
    on a per target basis.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 45b19078b..6ac16ab6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -14,17 +14,6 @@ cmake_policy(VERSION ${GDCM_CMAKE_POLICY_VERSION})
 if(CMAKE_CXX_STANDARD EQUAL "98" )
    message(FATAL_ERROR "CMAKE_CXX_STANDARD:STRING=98 is not supported in GDCM version 3.0.0 and greater.")
 endif()
-
-if(NOT CMAKE_CXX_STANDARD)
-  set(CMAKE_CXX_STANDARD 11)
-endif()
-if(NOT CMAKE_CXX_STANDARD_REQUIRED)
-  set(CMAKE_CXX_STANDARD_REQUIRED ON)
-endif()
-if(NOT CMAKE_CXX_EXTENSIONS)
-  set(CMAKE_CXX_EXTENSIONS OFF)
-endif()
-
 #----------------------------------------------------------------------------
 
 project(GDCM
diff --git a/Source/Common/CMakeLists.txt b/Source/Common/CMakeLists.txt
index fe67c06e6..15bda2664 100644
--- a/Source/Common/CMakeLists.txt
+++ b/Source/Common/CMakeLists.txt
@@ -188,6 +188,7 @@ set(Common_SRCS ${Common_SRCS}
 endif()
 
 add_library(gdcmCommon ${Common_SRCS})
+target_compile_features(gdcmCommon PUBLIC cxx_nullptr)
 
 #target_link_libraries(gdcmCommon ${GDCM_ZLIB_LIBRARIES}) # ${GDCM_POLARSSL_LIBRARIES})
 if(GDCM_BUILD_TESTING)
diff --git a/Source/DataStructureAndEncodingDefinition/CMakeLists.txt b/Source/DataStructureAndEncodingDefinition/CMakeLists.txt
index af9a2407a..d60ea1fef 100644
--- a/Source/DataStructureAndEncodingDefinition/CMakeLists.txt
+++ b/Source/DataStructureAndEncodingDefinition/CMakeLists.txt
@@ -85,6 +85,7 @@ if(NOT GDCM_USE_SYSTEM_ZLIB)
 endif()
 
 add_library(gdcmDSED ${DSED_SRCS} ${DSED3_SRCS})
+target_compile_features(gdcmDSED PUBLIC cxx_strong_enums)
 target_link_libraries(gdcmDSED LINK_PUBLIC gdcmCommon)
 # zlib stuff are actually included (template) so we need to link them here.
 target_link_libraries(gdcmDSED LINK_PRIVATE ${GDCM_ZLIB_LIBRARIES})
diff --git a/Utilities/gdcmcharls/CMakeLists.txt b/Utilities/gdcmcharls/CMakeLists.txt
index 69f093c04..fa459a696 100644
--- a/Utilities/gdcmcharls/CMakeLists.txt
+++ b/Utilities/gdcmcharls/CMakeLists.txt
@@ -73,7 +73,7 @@ add_library(${CHARLS_LIBRARY_NAME}
   interface.cpp  jpegls.cpp  jpegmarkersegment.cpp  jpegstreamreader.cpp  jpegstreamwriter.cpp
   )
 target_compile_features(${CHARLS_LIBRARY_NAME}
-# PUBLIC cxx_strong_enums
+ PUBLIC cxx_strong_enums
  PRIVATE cxx_nullptr)
 set_target_properties( ${CHARLS_LIBRARY_NAME} PROPERTIES
                               VERSION ${CHARLS_MAJOR_VERSION}.${CHARLS_MINOR_VERSION}
diff --git a/Utilities/socketxx/socket++/CMakeLists.txt b/Utilities/socketxx/socket++/CMakeLists.txt
index bbda9b794..24f69864f 100644
--- a/Utilities/socketxx/socket++/CMakeLists.txt
+++ b/Utilities/socketxx/socket++/CMakeLists.txt
@@ -68,6 +68,7 @@ if(UNIX)
 endif()
 
 add_library(${SOCKETXX_LIBRARY_NAME} ${libsocket___la_SOURCES})
+target_compile_features(${SOCKETXX_LIBRARY_NAME} PUBLIC cxx_nullptr)
 if(WIN32)
   target_link_libraries(${SOCKETXX_LIBRARY_NAME} ws2_32.lib)
 endif()

-----------------------------------------------------------------------

Summary of changes:
 CMakeLists.txt                                           | 11 -----------
 Source/Common/CMakeLists.txt                             |  1 +
 Source/DataStructureAndEncodingDefinition/CMakeLists.txt |  1 +
 Utilities/gdcmcharls/CMakeLists.txt                      |  2 +-
 Utilities/socketxx/socket++/CMakeLists.txt               |  1 +
 5 files changed, 4 insertions(+), 12 deletions(-)


hooks/post-receive
-- 
Grassroots DICOM