Merge pull request #4974 from blowekamp/tiff_dcmtk_config

BUG: Update libtiff's ITK module include paths
InsightSoftwareConsortium · Nov 22, 2024 · 27f1b1f · 27f1b1f
2 parents 90a18eb + 36c668f
commit 27f1b1f
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/Modules/ThirdParty/TIFF/CMakeLists.txt b/Modules/ThirdParty/TIFF/CMakeLists.txt
@@ -18,9 +18,8 @@ if(ITK_USE_SYSTEM_TIFF)
 else()
   set(ITKTIFF_INCLUDE_DIRS
     ${ITKTIFF_BINARY_DIR}/src
-    ${ITKTIFF_BINARY_DIR}/src/itktiff
+    ${ITKTIFF_BINARY_DIR}/src/itktiff/libtiff
     ${ITKTIFF_SOURCE_DIR}/src
-    ${ITKTIFF_SOURCE_DIR}/src/itktiff
     )
   set(ITKTIFF_LIBRARIES itktiff)
   set(ITK_LIBRARY_PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS FALSE)

diff --git a/Modules/ThirdParty/TIFF/src/itk_tiff.h.in b/Modules/ThirdParty/TIFF/src/itk_tiff.h.in
@@ -34,7 +34,7 @@
 #ifdef ITK_USE_SYSTEM_TIFF
 # include <tiffio.h>
 #else
-# include "itktiff/tiffio.h"
+# include "itktiff/libtiff/tiffio.h"
 #endif
 
 #endif
diff --git a/Modules/ThirdParty/TIFF/src/itktiff/itk_tiff_mangle.h b/Modules/ThirdParty/TIFF/src/itktiff/itk_tiff_mangle.h
diff --git a/Modules/ThirdParty/TIFF/src/itktiff/tiffio.h b/Modules/ThirdParty/TIFF/src/itktiff/tiffio.h