ZEISS · HakanAcundas · Jul 2, 2025 · Jul 3, 2025 · Jul 10, 2025 · Jul 10, 2025
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.15)
 cmake_policy(SET CMP0091 NEW) # enable new "MSVC runtime library selection" (https://cmake.org/cmake/help/latest/variable/CMAKE_MSVC_RUNTIME_LIBRARY.html)
 
 project(libCZI 
-      VERSION 0.66.6
+      VERSION 0.67.0
       HOMEPAGE_URL "https://github.com/ZEISS/libczi"
       DESCRIPTION "libCZI is an Open Source Cross-Platform C++ library to read and write CZI")
 

diff --git a/Src/CZICmd/inc_libCZI.h b/Src/CZICmd/inc_libCZI.h
@@ -4,4 +4,4 @@
 
 #pragma once
 
-#include "../libCZI/libCZI.h"
+#include "../libCZI/inc/libCZI.h"
diff --git a/Src/libCZI/BitmapOperations.cpp b/Src/libCZI/BitmapOperations.cpp
@@ -6,7 +6,7 @@
 #include "BitmapOperations.h"
 #include "MD5Sum.h"
 #include "utilities.h"
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "Site.h"
 #include "inc_libCZI_Config.h"
 

diff --git a/Src/libCZI/BitmapOperations.h b/Src/libCZI/BitmapOperations.h
@@ -6,7 +6,7 @@
 
 #include <memory>
 #include <algorithm>
-#include "libCZI_Pixels.h"
+#include "inc/libCZI_Pixels.h"
 
 class CBitmapOperations
 {

diff --git a/Src/libCZI/CMakeLists.txt b/Src/libCZI/CMakeLists.txt
@@ -6,6 +6,7 @@ include(FetchContent)
 include(CheckIncludeFiles)
 include(CheckSymbolExists)
 include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)
 
 set(LIBCZISRCFILES 
             BitmapOperations.cpp
@@ -74,23 +75,23 @@ set(LIBCZISRCFILES
             decoder_wic.h
             decoder_zstd.h
             FileHeaderSegmentData.h
-            ImportExport.h
-            inc_libCZI_Config.h
             IndexSet.h
-            libCZI.h
-            libCZI_Compositor.h
-            libCZI_compress.h
-            libCZI_DimCoordinate.h
-            libCZI_exceptions.h
-            libCZI_Helpers.h
-            libCZI_Metadata.h
-            libCZI_Metadata2.h
-            libCZI_Pixels.h
-            libCZI_ReadWrite.h
-            libCZI_Site.h
-            libCZI_Utilities.h
-            libCZI_Write.h
-            libCZI_StreamsLib.h
+            inc/ImportExport.h
+            inc/libCZI.h
+            inc/libCZI_Compositor.h
+            inc/libCZI_compress.h
+            inc/libCZI_DimCoordinate.h
+            inc/libCZI_exceptions.h
+            inc/libCZI_Helpers.h
+            inc/libCZI_Metadata.h
+            inc/libCZI_Metadata2.h
+            inc/libCZI_Pixels.h
+            inc/libCZI_ReadWrite.h
+            inc/libCZI_Site.h
+            inc/libCZI_Utilities.h
+            inc/libCZI_Write.h
+            inc/libCZI_StreamsLib.h
+            inc_libCZI_Config.h
             MD5Sum.h
             MultiChannelCompositor.h
             SingleChannelAccessorBase.h
@@ -298,11 +299,13 @@ configure_file (
   "${CMAKE_CURRENT_BINARY_DIR}/libCZI_Config.h"
   ESCAPE_QUOTES @ONLY)
 
+# one place to reference the public header dir in the source tree
+set(LIBCZI_PUBLIC_INC "${CMAKE_CURRENT_SOURCE_DIR}/inc")  
 
 #  Define headers for this library. PUBLIC headers are used for compiling the library, and will be added to consumers' build paths.
-set(libCZIPublicHeaders "ImportExport.h" "libCZI.h" "libCZI_Compositor.h" "libCZI_DimCoordinate.h" "libCZI_exceptions.h"
-               "libCZI_Helpers.h" "libCZI_Metadata.h" "libCZI_Metadata2.h" "libCZI_Pixels.h" "libCZI_ReadWrite.h"
-               "libCZI_Site.h" "libCZI_Utilities.h" "libCZI_Write.h" "libCZI_compress.h" "libCZI_StreamsLib.h")
+set(libCZIPublicHeaders "inc/ImportExport.h" "inc/libCZI.h" "inc/libCZI_Compositor.h" "inc/libCZI_DimCoordinate.h" "inc/libCZI_exceptions.h"
+               "inc/libCZI_Helpers.h" "inc/libCZI_Metadata.h" "inc/libCZI_Metadata2.h" "inc/libCZI_Pixels.h" "inc/libCZI_ReadWrite.h"
+               "inc/libCZI_Site.h" "inc/libCZI_Utilities.h" "inc/libCZI_Write.h" "inc/libCZI_compress.h" "inc/libCZI_StreamsLib.h")
 
 #
 #define the shared libCZI - library
@@ -340,10 +343,10 @@ if (LIBCZI_BUILD_DYNLIB)
   if(LIBCZI_HAVE_WIN32_API)
     target_link_libraries(libCZI PRIVATE ole32 Windowscodecs)
   endif()
-  target_include_directories(libCZI
-      PUBLIC
-        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-        $<INSTALL_INTERFACE:include>)
+  target_include_directories(libCZI PUBLIC
+    $<BUILD_INTERFACE:${LIBCZI_PUBLIC_INC}>
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+    $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libCZI>)
 endif(LIBCZI_BUILD_DYNLIB)
 
 #
@@ -373,7 +376,7 @@ if (LIBCZI_BUILD_AZURESDK_BASED_STREAM)
 endif()
 
 if (LIBCZI_BUILD_PREFER_EXTERNALPACKAGE_EIGEN3)
-  target_link_libraries(libCZIStatic PUBLIC Eigen3::Eigen)
+  target_link_libraries(libCZIStatic PRIVATE Eigen3::Eigen)
 else()
   add_dependencies(libCZIStatic eigen_ext)
 endif()
@@ -387,10 +390,40 @@ endif()
 target_compile_definitions(libCZIStatic PUBLIC _LIBCZISTATICLIB)    # make sure that users of the static library get the correct definition
 
 # Static library include directories
-target_include_directories(libCZIStatic
-  PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-    $<INSTALL_INTERFACE:include>)
+target_include_directories(libCZIStatic PUBLIC
+  $<BUILD_INTERFACE:${LIBCZI_PUBLIC_INC}>
+  $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+  $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libCZI>)
+
+
+
+
+# # DEBUG: dump interface includes as CMake sees them
+# get_target_property(_ii libCZI INTERFACE_INCLUDE_DIRECTORIES)
+# message(STATUS "libCZI INTERFACE_INCLUDE_DIRECTORIES = [${_ii}]")
+# get_target_property(_ii libCZIStatic INTERFACE_INCLUDE_DIRECTORIES)
+# message(STATUS "libCZIStatic INTERFACE_INCLUDE_DIRECTORIES = [${_ii}]")
+
+# # ---- Force-clean INTERFACE include dirs to be relocatable ----
+# # Split build paths into separate genex entries.
+# foreach(t libCZI libCZIStatic)
+#   if(TARGET ${t})
+#     set_property(TARGET ${t} PROPERTY INTERFACE_INCLUDE_DIRECTORIES
+#       $<BUILD_INTERFACE:${LIBCZI_PUBLIC_INC}>
+#       $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}>
+#       $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}/libCZI>)
+#   endif()
+# endforeach()
+
+# # (optional) verify
+# get_target_property(_ii libCZI INTERFACE_INCLUDE_DIRECTORIES)
+# message(STATUS "CLEAN libCZI INTERFACE_INCLUDE_DIRECTORIES = [${_ii}]")
+# get_target_property(_ii libCZIStatic INTERFACE_INCLUDE_DIRECTORIES)
+# message(STATUS "CLEAN libCZIStatic INTERFACE_INCLUDE_DIRECTORIES = [${_ii}]")
+
+
+
+
 
 if(LIBCZI_ENABLE_INSTALL)
 

diff --git a/Src/libCZI/CZIReader.h b/Src/libCZI/CZIReader.h
@@ -7,7 +7,7 @@
 #include <functional>
 #include <memory>
 #include <mutex>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziSubBlockDirectory.h"
 #include "CziAttachmentsDirectory.h"
 #include "FileHeaderSegmentData.h"

diff --git a/Src/libCZI/CreateBitmap.cpp b/Src/libCZI/CreateBitmap.cpp
@@ -4,7 +4,7 @@
 
 #include "bitmapData.h"
 #include "Site.h"
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "BitmapOperations.h"
 #include "inc_libCZI_Config.h"
 #include "CziSubBlock.h"

diff --git a/Src/libCZI/CziAttachment.h b/Src/libCZI/CziAttachment.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <memory>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziParse.h"
 
 class CCziAttachment : public  libCZI::IAttachment

diff --git a/Src/libCZI/CziAttachmentsDirectory.h b/Src/libCZI/CziAttachmentsDirectory.h
@@ -3,7 +3,7 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
 #pragma once
-#include "libCZI_Utilities.h"
+#include "inc/libCZI_Utilities.h"
 #include <functional>
 #include <vector>
 #include <set>

diff --git a/Src/libCZI/CziDimensionInfo.h b/Src/libCZI/CziDimensionInfo.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <vector>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziMetadata.h"
 
 class CCziDimensionInfo : public libCZI::IDimensionInfo

diff --git a/Src/libCZI/CziDisplaySettings.h b/Src/libCZI/CziDisplaySettings.h
@@ -6,7 +6,7 @@
 #include <vector>
 #include <map>
 #include <memory>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "splines.h"
 #include "pugixml.hpp"
 

diff --git a/Src/libCZI/CziMetadata.h b/Src/libCZI/CziMetadata.h
@@ -6,7 +6,7 @@
 
 #include <memory>
 #include <string>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "pugixml.hpp"
 #include "XmlNodeWrapper.h"
 

diff --git a/Src/libCZI/CziMetadataBuilder.h b/Src/libCZI/CziMetadataBuilder.h
@@ -9,7 +9,7 @@
 #include <map>
 #include <tuple>
 #include <string>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziSubBlockDirectory.h"
 #include "pugixml.hpp"
 

diff --git a/Src/libCZI/CziMetadataDocumentInfo.h b/Src/libCZI/CziMetadataDocumentInfo.h
@@ -6,7 +6,7 @@
 
 #include <map>
 #include <memory>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziMetadata.h"
 
 class CCziMetadataDocumentInfo : public libCZI::ICziMultiDimensionDocumentInfo

diff --git a/Src/libCZI/CziMetadataDocumentInfo2.h b/Src/libCZI/CziMetadataDocumentInfo2.h
@@ -6,7 +6,7 @@
 
 #include <memory>
 #include <vector>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "utilities.h"
 
 class CAttributeId : public libCZI::IAttributeId

diff --git a/Src/libCZI/CziMetadataSegment.h b/Src/libCZI/CziMetadataSegment.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <memory>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziParse.h"
 
 class CCziMetadataSegment : public  libCZI::IMetadataSegment

diff --git a/Src/libCZI/CziParse.cpp b/Src/libCZI/CziParse.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziParse.h"
 #include "CziStructs.h"
 #include <cassert>

diff --git a/Src/libCZI/CziParse.h b/Src/libCZI/CziParse.h
@@ -10,7 +10,7 @@
 #include "CziSubBlockDirectory.h"
 #include "CziAttachmentsDirectory.h"
 #include "FileHeaderSegmentData.h"
-#include "libCZI.h"
+#include "inc/libCZI.h"
 
 class CCZIParse
 {

diff --git a/Src/libCZI/CziReaderCommon.h b/Src/libCZI/CziReaderCommon.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziAttachment.h"
 #include <functional>
 

diff --git a/Src/libCZI/CziReaderWriter.cpp b/Src/libCZI/CziReaderWriter.cpp
@@ -4,9 +4,9 @@
 
 #include "CziReaderWriter.h"
 #include "CziMetadataSegment.h"
-#include "libCZI_Utilities.h"
+#include "inc/libCZI_Utilities.h"
 #include "CziUtils.h"
-#include "libCZI_exceptions.h"
+#include "inc/libCZI_exceptions.h"
 #include "CziMetadataBuilder.h"
 #include "utilities.h"
 #include "CziSubBlock.h"

diff --git a/Src/libCZI/CziReaderWriter.h b/Src/libCZI/CziReaderWriter.h
@@ -6,12 +6,12 @@
 
 #include <memory>
 #include <tuple>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziSubBlockDirectory.h"
 #include "CziAttachmentsDirectory.h"
 #include "CziStructs.h"
 #include "CziWriter.h"
-#include "libCZI_ReadWrite.h"
+#include "inc/libCZI_ReadWrite.h"
 #include "FileHeaderSegmentData.h"
 #include "CziParse.h"
 

diff --git a/Src/libCZI/CziStructs.h b/Src/libCZI/CziStructs.h
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "libCZI_Utilities.h"
+#include "inc/libCZI_Utilities.h"
 
 #if !defined(__GNUC__)
 #include <pshpack2.h>

diff --git a/Src/libCZI/CziSubBlock.h b/Src/libCZI/CziSubBlock.h
@@ -5,7 +5,7 @@
 #pragma once
 
 #include <memory>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziParse.h"
 
 class CCziSubBlock : public  libCZI::ISubBlock

diff --git a/Src/libCZI/CziSubBlockDirectory.h b/Src/libCZI/CziSubBlockDirectory.h
@@ -9,7 +9,7 @@
 #include <map>
 #include <functional>
 #include <set>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 
 class CCziSubBlockDirectoryBase
 {

diff --git a/Src/libCZI/CziUtils.h b/Src/libCZI/CziUtils.h
@@ -6,8 +6,8 @@
 
 #include <functional>
 #include <cstdint>
-#include "libCZI_Pixels.h"
-#include "libCZI_DimCoordinate.h"
+#include "inc/libCZI_Pixels.h"
+#include "inc/libCZI_DimCoordinate.h"
 
 enum class CompareResult
 {

diff --git a/Src/libCZI/CziWriter.cpp b/Src/libCZI/CziWriter.cpp
@@ -4,9 +4,9 @@
 
 #include "CziWriter.h"
 #include "CziMetadataSegment.h"
-#include "libCZI_Utilities.h"
+#include "inc/libCZI_Utilities.h"
 #include "CziUtils.h"
-#include "libCZI_exceptions.h"
+#include "inc/libCZI_exceptions.h"
 #include "CziMetadataBuilder.h"
 #include "utilities.h"
 

diff --git a/Src/libCZI/CziWriter.h b/Src/libCZI/CziWriter.h
@@ -7,7 +7,7 @@
 #include <memory>
 #include <string>
 #include <tuple>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include "CziSubBlockDirectory.h"
 #include "CziAttachmentsDirectory.h"
 #include "CziStructs.h"

diff --git a/Src/libCZI/DimCoordinate.cpp b/Src/libCZI/DimCoordinate.cpp
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: LGPL-3.0-or-later
 
-#include "libCZI.h"
+#include "inc/libCZI.h"
 #include <climits>
 #include <regex>
 

diff --git a/Src/libCZI/IndexSet.h b/Src/libCZI/IndexSet.h
@@ -6,7 +6,7 @@
 
 #include <vector>
 #include <tuple>
-#include "libCZI.h"
+#include "inc/libCZI.h"
 
 class CIndexSet : public libCZI::IIndexSet
 {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -4,4 +4,4 @@

		#pragma once

		#include "../libCZI/libCZI.h"
		#include "../libCZI/inc/libCZI.h"