Mercurial > hg > orthanc

changeset 4172:9a7491cae01a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author Sebastien Jodogne <s.jodogne@gmail.com>
date Tue, 01 Sep 2020 17:55:54 +0200
parents 822d3a17d797 (current diff) 1657c8700974 (diff)
children 24759c286b5e
files
diffstat 3 files changed, 3 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- 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()
--- 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)
 
 
--- 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)