Mercurial > hg > orthanc-gdcm

changeset 103:ab1e8b8f127d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cont
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 01 Sep 2025 17:53:53 +0200
parents 50803058462d
children 80ff83122269
files Resources/CMake/GdcmConfiguration.cmake
diffstat 1 files changed, 8 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/GdcmConfiguration.cmake	Mon Sep 01 16:54:37 2025 +0200
+++ b/Resources/CMake/GdcmConfiguration.cmake	Mon Sep 01 17:53:53 2025 +0200
@@ -101,6 +101,9 @@
     TIMEOUT 60
     ${PATCH_COMMAND}   # Apply patch to remove networking support (*)
     CMAKE_ARGS -DCMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE} "-DCMAKE_INSTALL_PREFIX=${GDCM_INSTALL_DIR}" ${Flags}
+
+    # https://stackoverflow.com/a/43363395
+    INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install --config ${CMAKE_BUILD_TYPE}
     )
 
   if(MSVC)
@@ -143,16 +146,11 @@
 
   link_directories(${GDCM_INSTALL_DIR}/lib)
 
-  ExternalProject_Get_Property(GDCM binary_dir)
-  include_directories(${binary_dir}/Source/Common)
-
-  ExternalProject_Get_Property(GDCM source_dir)
-  include_directories(
-    ${source_dir}/Source/Common
-    ${source_dir}/Source/DataDictionary
-    ${source_dir}/Source/DataStructureAndEncodingDefinition
-    ${source_dir}/Source/MediaStorageAndFileFormat
-    )
+  if (USE_LEGACY_GDCM)
+    include_directories(${GDCM_INSTALL_DIR}/include/gdcm-2.8)
+  else()
+    include_directories(${GDCM_INSTALL_DIR}/include/gdcm-3.0)
+  endif()
 
 else()
   find_package(GDCM REQUIRED)