# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1598975754 -7200
# Node ID 9a7491cae01a9930c9f93745483a6af0ebd31bb0
# Parent  822d3a17d79743040c5239ae6ed649128d918beb# Parent  1657c8700974a5aec6a98122558a6645b65ecf7c
merge

diff -r 822d3a17d797 -r 9a7491cae01a OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake
--- a/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake	Tue Sep 01 17:55:42 2020 +0200
+++ b/OrthancFramework/Resources/CMake/DcmtkConfiguration.cmake	Tue Sep 01 17:55:54 2020 +0200
@@ -169,16 +169,6 @@
       DICTIONARY_PRIVATE ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
       DICTIONARY_DICONDE ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic
       )
-    
-    # Fix CMake Policy CMP0058 (related to ninja) by creating a phony
-    # target for files coming from downloaded packages
-    add_custom_command(
-      OUTPUT
-      ${DCMTK_SOURCES_DIR}/dcmdata/data/dicom.dic
-      ${DCMTK_SOURCES_DIR}/dcmdata/data/private.dic
-      ${DCMTK_SOURCES_DIR}/dcmdata/data/diconde.dic
-      COMMAND ${CMAKE_COMMAND} -E echo_append ""
-      )
   else()
     set(DCMTK_USE_EMBEDDED_DICTIONARIES 0)
   endif()
diff -r 822d3a17d797 -r 9a7491cae01a OrthancFramework/SharedLibrary/CMakeLists.txt
--- a/OrthancFramework/SharedLibrary/CMakeLists.txt	Tue Sep 01 17:55:42 2020 +0200
+++ b/OrthancFramework/SharedLibrary/CMakeLists.txt	Tue Sep 01 17:55:54 2020 +0200
@@ -29,6 +29,8 @@
 
 
 cmake_minimum_required(VERSION 2.8)
+cmake_policy(SET CMP0058 NEW)
+
 project(OrthancFramework)
 
 
diff -r 822d3a17d797 -r 9a7491cae01a OrthancServer/CMakeLists.txt
--- a/OrthancServer/CMakeLists.txt	Tue Sep 01 17:55:42 2020 +0200
+++ b/OrthancServer/CMakeLists.txt	Tue Sep 01 17:55:54 2020 +0200
@@ -30,6 +30,7 @@
 
 
 cmake_minimum_required(VERSION 2.8)
+cmake_policy(SET CMP0058 NEW)
 
 project(Orthanc)