diff --git a/CMakeLists.txt b/CMakeLists.txt index 4a57cac6..78113f6e 100644 --- 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 index ac041fd5..caf5903e 100644 --- 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 index cd373bdd..c21adf84 100644 --- 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 index 87fb8402..ae34ff74 100644 --- a/Src/libCZI/BitmapOperations.h +++ b/Src/libCZI/BitmapOperations.h @@ -6,7 +6,7 @@ #include #include -#include "libCZI_Pixels.h" +#include "inc/libCZI_Pixels.h" class CBitmapOperations { diff --git a/Src/libCZI/CMakeLists.txt b/Src/libCZI/CMakeLists.txt index 16c1951b..30b0ef8a 100644 --- 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 - $ - $) + target_include_directories(libCZI PUBLIC + $ + $ + $) 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 - $ - $) +target_include_directories(libCZIStatic PUBLIC + $ + $ + $) + + + + +# # 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 +# $ +# $ +# $) +# 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 index a9ca5865..ec9172e0 100644 --- a/Src/libCZI/CZIReader.h +++ b/Src/libCZI/CZIReader.h @@ -7,7 +7,7 @@ #include #include #include -#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 index 47e8675a..edf994be 100644 --- 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 index 940e1617..07465cd8 100644 --- a/Src/libCZI/CziAttachment.h +++ b/Src/libCZI/CziAttachment.h @@ -5,7 +5,7 @@ #pragma once #include -#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 index 0f25c7f7..22afd5fc 100644 --- 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 #include #include diff --git a/Src/libCZI/CziDimensionInfo.h b/Src/libCZI/CziDimensionInfo.h index 6d1b64d9..e5e8fe4a 100644 --- a/Src/libCZI/CziDimensionInfo.h +++ b/Src/libCZI/CziDimensionInfo.h @@ -5,7 +5,7 @@ #pragma once #include -#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 index ba8b5d7d..dc4dc51d 100644 --- a/Src/libCZI/CziDisplaySettings.h +++ b/Src/libCZI/CziDisplaySettings.h @@ -6,7 +6,7 @@ #include #include #include -#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 index cb9a6446..575038bf 100644 --- a/Src/libCZI/CziMetadata.h +++ b/Src/libCZI/CziMetadata.h @@ -6,7 +6,7 @@ #include #include -#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 index 2b0b2f70..b0addb0c 100644 --- a/Src/libCZI/CziMetadataBuilder.h +++ b/Src/libCZI/CziMetadataBuilder.h @@ -9,7 +9,7 @@ #include #include #include -#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 index 2f9ac954..5dba6bce 100644 --- a/Src/libCZI/CziMetadataDocumentInfo.h +++ b/Src/libCZI/CziMetadataDocumentInfo.h @@ -6,7 +6,7 @@ #include #include -#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 index e18179b1..67ffaf05 100644 --- a/Src/libCZI/CziMetadataDocumentInfo2.h +++ b/Src/libCZI/CziMetadataDocumentInfo2.h @@ -6,7 +6,7 @@ #include #include -#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 index 22af1257..d28c880d 100644 --- a/Src/libCZI/CziMetadataSegment.h +++ b/Src/libCZI/CziMetadataSegment.h @@ -5,7 +5,7 @@ #pragma once #include -#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 index 5643ace9..a22550da 100644 --- 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 diff --git a/Src/libCZI/CziParse.h b/Src/libCZI/CziParse.h index 79da6f2e..1e7b2859 100644 --- 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 index ab43da7a..9c502512 100644 --- 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 diff --git a/Src/libCZI/CziReaderWriter.cpp b/Src/libCZI/CziReaderWriter.cpp index 4bb2014f..dc8b5d57 100644 --- 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 index 10557d20..763a50b9 100644 --- a/Src/libCZI/CziReaderWriter.h +++ b/Src/libCZI/CziReaderWriter.h @@ -6,12 +6,12 @@ #include #include -#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 index 3b998675..a31835d4 100644 --- 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 diff --git a/Src/libCZI/CziSubBlock.h b/Src/libCZI/CziSubBlock.h index 77bef55c..cf1d9927 100644 --- a/Src/libCZI/CziSubBlock.h +++ b/Src/libCZI/CziSubBlock.h @@ -5,7 +5,7 @@ #pragma once #include -#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 index c5ec7694..75dbfb26 100644 --- a/Src/libCZI/CziSubBlockDirectory.h +++ b/Src/libCZI/CziSubBlockDirectory.h @@ -9,7 +9,7 @@ #include #include #include -#include "libCZI.h" +#include "inc/libCZI.h" class CCziSubBlockDirectoryBase { diff --git a/Src/libCZI/CziUtils.h b/Src/libCZI/CziUtils.h index d072e7f2..f99ed3e0 100644 --- a/Src/libCZI/CziUtils.h +++ b/Src/libCZI/CziUtils.h @@ -6,8 +6,8 @@ #include #include -#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 index 5eff5de2..c28bda11 100644 --- 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 index f96a4421..e5c6bf34 100644 --- a/Src/libCZI/CziWriter.h +++ b/Src/libCZI/CziWriter.h @@ -7,7 +7,7 @@ #include #include #include -#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 index 71617696..7d45f6a0 100644 --- 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 #include diff --git a/Src/libCZI/IndexSet.h b/Src/libCZI/IndexSet.h index ed1a8dc3..1c3a7e68 100644 --- a/Src/libCZI/IndexSet.h +++ b/Src/libCZI/IndexSet.h @@ -6,7 +6,7 @@ #include #include -#include "libCZI.h" +#include "inc/libCZI.h" class CIndexSet : public libCZI::IIndexSet { diff --git a/Src/libCZI/MultiChannelCompositor.cpp b/Src/libCZI/MultiChannelCompositor.cpp index a9f16cde..16d049d6 100644 --- a/Src/libCZI/MultiChannelCompositor.cpp +++ b/Src/libCZI/MultiChannelCompositor.cpp @@ -3,7 +3,7 @@ // SPDX-License-Identifier: LGPL-3.0-or-later #include "MultiChannelCompositor.h" -#include "libCZI_Utilities.h" +#include "inc/libCZI_Utilities.h" #include #include "Site.h" diff --git a/Src/libCZI/MultiChannelCompositor.h b/Src/libCZI/MultiChannelCompositor.h index 77d4d79e..e247810b 100644 --- a/Src/libCZI/MultiChannelCompositor.h +++ b/Src/libCZI/MultiChannelCompositor.h @@ -4,4 +4,4 @@ #pragma once -#include "libCZI_Compositor.h" +#include "inc/libCZI_Compositor.h" diff --git a/Src/libCZI/SingleChannelAccessorBase.h b/Src/libCZI/SingleChannelAccessorBase.h index 90fb8765..3021e182 100644 --- a/Src/libCZI/SingleChannelAccessorBase.h +++ b/Src/libCZI/SingleChannelAccessorBase.h @@ -5,7 +5,7 @@ #pragma once #include -#include "libCZI.h" +#include "inc/libCZI.h" class CSingleChannelAccessorBase { diff --git a/Src/libCZI/SingleChannelPyramidLevelTileAccessor.h b/Src/libCZI/SingleChannelPyramidLevelTileAccessor.h index df608824..90a1f036 100644 --- a/Src/libCZI/SingleChannelPyramidLevelTileAccessor.h +++ b/Src/libCZI/SingleChannelPyramidLevelTileAccessor.h @@ -8,7 +8,7 @@ #include #include #include "CZIReader.h" -#include "libCZI.h" +#include "inc/libCZI.h" #include "SingleChannelAccessorBase.h" class CSingleChannelPyramidLevelTileAccessor : public CSingleChannelAccessorBase, public libCZI::ISingleChannelPyramidLayerTileAccessor diff --git a/Src/libCZI/SingleChannelScalingTileAccessor.h b/Src/libCZI/SingleChannelScalingTileAccessor.h index 7c0fbfc0..6476d215 100644 --- a/Src/libCZI/SingleChannelScalingTileAccessor.h +++ b/Src/libCZI/SingleChannelScalingTileAccessor.h @@ -8,7 +8,7 @@ #include #include #include "CZIReader.h" -#include "libCZI.h" +#include "inc/libCZI.h" #include "SingleChannelAccessorBase.h" class CSingleChannelScalingTileAccessor : public CSingleChannelAccessorBase, public libCZI::ISingleChannelScalingTileAccessor diff --git a/Src/libCZI/SingleChannelTileAccessor.h b/Src/libCZI/SingleChannelTileAccessor.h index 007550c0..39062e7c 100644 --- a/Src/libCZI/SingleChannelTileAccessor.h +++ b/Src/libCZI/SingleChannelTileAccessor.h @@ -7,7 +7,7 @@ #include #include #include "CZIReader.h" -#include "libCZI.h" +#include "inc/libCZI.h" #include "SingleChannelAccessorBase.h" class CSingleChannelTileAccessor : public CSingleChannelAccessorBase, public libCZI::ISingleChannelTileAccessor diff --git a/Src/libCZI/SingleChannelTileCompositor.cpp b/Src/libCZI/SingleChannelTileCompositor.cpp index a787c373..21f3abbe 100644 --- a/Src/libCZI/SingleChannelTileCompositor.cpp +++ b/Src/libCZI/SingleChannelTileCompositor.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "libCZI.h" +#include "inc/libCZI.h" #include "SingleChannelTileCompositor.h" #include "BitmapOperations.h" diff --git a/Src/libCZI/SingleChannelTileCompositor.h b/Src/libCZI/SingleChannelTileCompositor.h index 56058887..5c9903cd 100644 --- a/Src/libCZI/SingleChannelTileCompositor.h +++ b/Src/libCZI/SingleChannelTileCompositor.h @@ -4,7 +4,7 @@ #pragma once -#include "libCZI_Pixels.h" +#include "inc/libCZI_Pixels.h" class CSingleChannelTileCompositor { diff --git a/Src/libCZI/Site.h b/Src/libCZI/Site.h index cce9f551..d61dfc0c 100644 --- a/Src/libCZI/Site.h +++ b/Src/libCZI/Site.h @@ -3,6 +3,6 @@ // SPDX-License-Identifier: LGPL-3.0-or-later #pragma once -#include "libCZI_Site.h" +#include "inc/libCZI_Site.h" libCZI::ISite* GetSite(); diff --git a/Src/libCZI/StreamImpl.h b/Src/libCZI/StreamImpl.h index 1ce6edff..4d22c87a 100644 --- a/Src/libCZI/StreamImpl.h +++ b/Src/libCZI/StreamImpl.h @@ -4,7 +4,7 @@ #pragma once -#include "libCZI.h" +#include "inc/libCZI.h" #include "inc_libCZI_Config.h" #include #if LIBCZI_WINDOWSAPI_AVAILABLE diff --git a/Src/libCZI/StreamsLib/azureblobinputstream.h b/Src/libCZI/StreamsLib/azureblobinputstream.h index 622871fd..7de00735 100644 --- a/Src/libCZI/StreamsLib/azureblobinputstream.h +++ b/Src/libCZI/StreamsLib/azureblobinputstream.h @@ -10,7 +10,7 @@ #include #include -#include "../libCZI.h" +#include "../inc/libCZI.h" #include /// Implementation of stream object based on Azure-SDK C++ (https://github.com/Azure/azure-sdk-for-cpp). diff --git a/Src/libCZI/StreamsLib/curlhttpinputstream.cpp b/Src/libCZI/StreamsLib/curlhttpinputstream.cpp index 0e4c739e..3ea06342 100644 --- a/Src/libCZI/StreamsLib/curlhttpinputstream.cpp +++ b/Src/libCZI/StreamsLib/curlhttpinputstream.cpp @@ -7,7 +7,7 @@ #include #include #include -#include "../libCZI_StreamsLib.h" +#include "../inc/libCZI_StreamsLib.h" #include using namespace std; diff --git a/Src/libCZI/StreamsLib/curlhttpinputstream.h b/Src/libCZI/StreamsLib/curlhttpinputstream.h index a63c98e6..0cb39324 100644 --- a/Src/libCZI/StreamsLib/curlhttpinputstream.h +++ b/Src/libCZI/StreamsLib/curlhttpinputstream.h @@ -10,7 +10,7 @@ #include #include #include -#include "../libCZI.h" +#include "../inc/libCZI.h" #include /// A simplistic implementation of a stream which uses the curl library to read from an http or https stream. diff --git a/Src/libCZI/StreamsLib/preadfileinputstream.h b/Src/libCZI/StreamsLib/preadfileinputstream.h index df9942a6..1292a304 100644 --- a/Src/libCZI/StreamsLib/preadfileinputstream.h +++ b/Src/libCZI/StreamsLib/preadfileinputstream.h @@ -6,7 +6,7 @@ #include #if LIBCZI_USE_PREADPWRITEBASED_STREAMIMPL -#include "../libCZI.h" +#include "../inc/libCZI.h" /// Implementation of the IStream-interface for files based on the Unix-specific pread-API. /// It leverages the pread function passing in an offset, thus allowing for concurrent diff --git a/Src/libCZI/StreamsLib/simplefileinputstream.h b/Src/libCZI/StreamsLib/simplefileinputstream.h index 46423178..312d12ce 100644 --- a/Src/libCZI/StreamsLib/simplefileinputstream.h +++ b/Src/libCZI/StreamsLib/simplefileinputstream.h @@ -9,7 +9,7 @@ #include #include -#include "../libCZI.h" +#include "../inc/libCZI.h" /// Implementation of the IStream-interface for files based on C-API fseek/fread. /// Since seeking is not thread-safe with this API, we need to have a critical section diff --git a/Src/libCZI/StreamsLib/streamsFactory.cpp b/Src/libCZI/StreamsLib/streamsFactory.cpp index af030942..93046638 100644 --- a/Src/libCZI/StreamsLib/streamsFactory.cpp +++ b/Src/libCZI/StreamsLib/streamsFactory.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "../libCZI_StreamsLib.h" +#include "../inc/libCZI_StreamsLib.h" #include #include #include diff --git a/Src/libCZI/StreamsLib/uwpfileinputstream.h b/Src/libCZI/StreamsLib/uwpfileinputstream.h index 3c92e611..8ff82364 100644 --- a/Src/libCZI/StreamsLib/uwpfileinputstream.h +++ b/Src/libCZI/StreamsLib/uwpfileinputstream.h @@ -7,7 +7,7 @@ #if LIBCZI_WINDOWS_UWPAPI_AVAILABLE #include -#include "../libCZI.h" +#include "../inc/libCZI.h" #include /// Implementation of the IStream-interface for files based on the Win32-API. diff --git a/Src/libCZI/StreamsLib/windowsfileinputstream.h b/Src/libCZI/StreamsLib/windowsfileinputstream.h index dc0da30f..bfba158c 100644 --- a/Src/libCZI/StreamsLib/windowsfileinputstream.h +++ b/Src/libCZI/StreamsLib/windowsfileinputstream.h @@ -7,7 +7,7 @@ #if LIBCZI_WINDOWSAPI_AVAILABLE #include -#include "../libCZI.h" +#include "../inc/libCZI.h" #include /// Implementation of the IStream-interface for files based on the Win32-API. diff --git a/Src/libCZI/XmlNodeWrapper.h b/Src/libCZI/XmlNodeWrapper.h index f53591c6..d3c8b66a 100644 --- a/Src/libCZI/XmlNodeWrapper.h +++ b/Src/libCZI/XmlNodeWrapper.h @@ -9,12 +9,12 @@ #include #include -#include "libCZI_Metadata.h" +#include "inc/libCZI_Metadata.h" #include #include #include "utilities.h" #include "pugixml.hpp" -#include "libCZI_exceptions.h" +#include "inc/libCZI_exceptions.h" /// A utility for parsing an "XML path specifier" (as used with IXmlNodeRead). /// diff --git a/Src/libCZI/bitmapData.h b/Src/libCZI/bitmapData.h index 9bf4344f..d69039b9 100644 --- a/Src/libCZI/bitmapData.h +++ b/Src/libCZI/bitmapData.h @@ -6,7 +6,7 @@ #include #include -#include "libCZI_Pixels.h" +#include "inc/libCZI_Pixels.h" #include "CziUtils.h" #include "stdAllocator.h" #include "Site.h" diff --git a/Src/libCZI/decoder.h b/Src/libCZI/decoder.h index 92da0a30..4823070b 100644 --- a/Src/libCZI/decoder.h +++ b/Src/libCZI/decoder.h @@ -5,9 +5,9 @@ #pragma once #include -#include "libCZI_Pixels.h" -#include "libCZI_compress.h" -#include "libCZI_Site.h" +#include "inc/libCZI_Pixels.h" +#include "inc/libCZI_compress.h" +#include "inc/libCZI_Site.h" class CJxrLibDecoder : public libCZI::IDecoder { diff --git a/Src/libCZI/decoder_wic.h b/Src/libCZI/decoder_wic.h index 3f3e12d0..13d3f0c4 100644 --- a/Src/libCZI/decoder_wic.h +++ b/Src/libCZI/decoder_wic.h @@ -9,8 +9,8 @@ #if LIBCZI_WINDOWSAPI_AVAILABLE #include -#include "libCZI_Pixels.h" -#include "libCZI_Site.h" +#include "inc/libCZI_Pixels.h" +#include "inc/libCZI_Site.h" struct IWICBitmapDecoder; struct IWICImagingFactory; diff --git a/Src/libCZI/decoder_zstd.cpp b/Src/libCZI/decoder_zstd.cpp index a8dddb24..8b902bd3 100644 --- a/Src/libCZI/decoder_zstd.cpp +++ b/Src/libCZI/decoder_zstd.cpp @@ -10,7 +10,7 @@ #include #endif #include "bitmapData.h" -#include "libCZI_Utilities.h" +#include "inc/libCZI_Utilities.h" #include "utilities.h" #include diff --git a/Src/libCZI/decoder_zstd.h b/Src/libCZI/decoder_zstd.h index 9a9fa02e..d6b7e95c 100644 --- a/Src/libCZI/decoder_zstd.h +++ b/Src/libCZI/decoder_zstd.h @@ -5,8 +5,8 @@ #pragma once #include -#include "libCZI_Pixels.h" -#include "libCZI_Site.h" +#include "inc/libCZI_Pixels.h" +#include "inc/libCZI_Site.h" class CZstd0Decoder : public libCZI::IDecoder { diff --git a/Src/libCZI/ImportExport.h b/Src/libCZI/inc/ImportExport.h similarity index 100% rename from Src/libCZI/ImportExport.h rename to Src/libCZI/inc/ImportExport.h diff --git a/Src/libCZI/libCZI.h b/Src/libCZI/inc/libCZI.h similarity index 100% rename from Src/libCZI/libCZI.h rename to Src/libCZI/inc/libCZI.h diff --git a/Src/libCZI/libCZI_Compositor.h b/Src/libCZI/inc/libCZI_Compositor.h similarity index 100% rename from Src/libCZI/libCZI_Compositor.h rename to Src/libCZI/inc/libCZI_Compositor.h diff --git a/Src/libCZI/libCZI_DimCoordinate.h b/Src/libCZI/inc/libCZI_DimCoordinate.h similarity index 100% rename from Src/libCZI/libCZI_DimCoordinate.h rename to Src/libCZI/inc/libCZI_DimCoordinate.h diff --git a/Src/libCZI/libCZI_Helpers.h b/Src/libCZI/inc/libCZI_Helpers.h similarity index 100% rename from Src/libCZI/libCZI_Helpers.h rename to Src/libCZI/inc/libCZI_Helpers.h diff --git a/Src/libCZI/libCZI_Metadata.h b/Src/libCZI/inc/libCZI_Metadata.h similarity index 100% rename from Src/libCZI/libCZI_Metadata.h rename to Src/libCZI/inc/libCZI_Metadata.h diff --git a/Src/libCZI/libCZI_Metadata2.h b/Src/libCZI/inc/libCZI_Metadata2.h similarity index 100% rename from Src/libCZI/libCZI_Metadata2.h rename to Src/libCZI/inc/libCZI_Metadata2.h diff --git a/Src/libCZI/libCZI_Pixels.h b/Src/libCZI/inc/libCZI_Pixels.h similarity index 100% rename from Src/libCZI/libCZI_Pixels.h rename to Src/libCZI/inc/libCZI_Pixels.h diff --git a/Src/libCZI/libCZI_ReadWrite.h b/Src/libCZI/inc/libCZI_ReadWrite.h similarity index 100% rename from Src/libCZI/libCZI_ReadWrite.h rename to Src/libCZI/inc/libCZI_ReadWrite.h diff --git a/Src/libCZI/libCZI_Site.h b/Src/libCZI/inc/libCZI_Site.h similarity index 100% rename from Src/libCZI/libCZI_Site.h rename to Src/libCZI/inc/libCZI_Site.h diff --git a/Src/libCZI/libCZI_StreamsLib.h b/Src/libCZI/inc/libCZI_StreamsLib.h similarity index 100% rename from Src/libCZI/libCZI_StreamsLib.h rename to Src/libCZI/inc/libCZI_StreamsLib.h diff --git a/Src/libCZI/libCZI_Utilities.h b/Src/libCZI/inc/libCZI_Utilities.h similarity index 100% rename from Src/libCZI/libCZI_Utilities.h rename to Src/libCZI/inc/libCZI_Utilities.h diff --git a/Src/libCZI/libCZI_Write.h b/Src/libCZI/inc/libCZI_Write.h similarity index 100% rename from Src/libCZI/libCZI_Write.h rename to Src/libCZI/inc/libCZI_Write.h diff --git a/Src/libCZI/libCZI_compress.h b/Src/libCZI/inc/libCZI_compress.h similarity index 100% rename from Src/libCZI/libCZI_compress.h rename to Src/libCZI/inc/libCZI_compress.h diff --git a/Src/libCZI/libCZI_exceptions.h b/Src/libCZI/inc/libCZI_exceptions.h similarity index 100% rename from Src/libCZI/libCZI_exceptions.h rename to Src/libCZI/inc/libCZI_exceptions.h diff --git a/Src/libCZI/jxrlibcompress.cpp b/Src/libCZI/jxrlibcompress.cpp index 972d02c7..ce5b9af8 100644 --- a/Src/libCZI/jxrlibcompress.cpp +++ b/Src/libCZI/jxrlibcompress.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "libCZI_compress.h" +#include "inc/libCZI_compress.h" #include "../JxrDecode/JxrDecode.h" #include "BitmapOperations.h" #include "Site.h" diff --git a/Src/libCZI/libCZI_Lib.cpp b/Src/libCZI/libCZI_Lib.cpp index 5ac09bd7..cda2d10f 100644 --- a/Src/libCZI/libCZI_Lib.cpp +++ b/Src/libCZI/libCZI_Lib.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "libCZI.h" +#include "inc/libCZI.h" #include "CZIReader.h" #include "CziMetadata.h" #include "SingleChannelTileAccessor.h" diff --git a/Src/libCZI/libCZI_Site.cpp b/Src/libCZI/libCZI_Site.cpp index dbadc5d0..efdd1ffe 100644 --- a/Src/libCZI/libCZI_Site.cpp +++ b/Src/libCZI/libCZI_Site.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "libCZI.h" +#include "inc/libCZI.h" #include "inc_libCZI_Config.h" #include "decoder.h" #include "decoder_zstd.h" diff --git a/Src/libCZI/libCZI_Utilities.cpp b/Src/libCZI/libCZI_Utilities.cpp index f32a96c4..6945ddab 100644 --- a/Src/libCZI/libCZI_Utilities.cpp +++ b/Src/libCZI/libCZI_Utilities.cpp @@ -2,7 +2,7 @@ // // SPDX-License-Identifier: LGPL-3.0-or-later -#include "libCZI.h" +#include "inc/libCZI.h" #include "Site.h" #include "BitmapOperations.h" #include "splines.h" diff --git a/Src/libCZI/splines.h b/Src/libCZI/splines.h index c2b42936..bb806974 100644 --- a/Src/libCZI/splines.h +++ b/Src/libCZI/splines.h @@ -6,7 +6,7 @@ #include #include -#include "libCZI_Metadata.h" +#include "inc/libCZI_Metadata.h" class CSplines { diff --git a/Src/libCZI/subblock_cache.h b/Src/libCZI/subblock_cache.h index a019b972..6ff80002 100644 --- a/Src/libCZI/subblock_cache.h +++ b/Src/libCZI/subblock_cache.h @@ -4,7 +4,7 @@ #pragma once -#include "libCZI.h" +#include "inc/libCZI.h" #include #include #include diff --git a/Src/libCZI/utilities.h b/Src/libCZI/utilities.h index b036b635..99034c31 100644 --- a/Src/libCZI/utilities.h +++ b/Src/libCZI/utilities.h @@ -10,8 +10,8 @@ #include #include #include -#include "libCZI_Pixels.h" -#include "libCZI_Utilities.h" +#include "inc/libCZI_Pixels.h" +#include "inc/libCZI_Utilities.h" class Utilities { diff --git a/Src/libCZI/zstdCompress.cpp b/Src/libCZI/zstdCompress.cpp index f2fe815c..0aee2a4d 100644 --- a/Src/libCZI/zstdCompress.cpp +++ b/Src/libCZI/zstdCompress.cpp @@ -11,7 +11,7 @@ #include #endif #include "BitmapOperations.h" -#include "libCZI_compress.h" +#include "inc/libCZI_compress.h" #include "utilities.h" using namespace std; diff --git a/Src/libCZIAPI/CMakeLists.txt b/Src/libCZIAPI/CMakeLists.txt index 3bdd6eae..98a160ba 100644 --- a/Src/libCZIAPI/CMakeLists.txt +++ b/Src/libCZIAPI/CMakeLists.txt @@ -75,8 +75,8 @@ target_compile_definitions(libCZIAPIStatic PRIVATE _LIBCZISTATICLIB _LIBCZIAPIST target_link_libraries(libCZIAPI PRIVATE libCZIStatic) target_link_libraries(libCZIAPIStatic PRIVATE libCZIStatic) -target_include_directories(libCZIAPI PRIVATE ../libCZI ${RAPIDJSON_INCLUDE_DIRS}) -target_include_directories(libCZIAPIStatic PRIVATE ../libCZI ${RAPIDJSON_INCLUDE_DIRS}) +target_include_directories(libCZIAPI PRIVATE ../libCZI ../libCZI/inc ${RAPIDJSON_INCLUDE_DIRS}) +target_include_directories(libCZIAPIStatic PRIVATE ../libCZI ../libCZI/inc ${RAPIDJSON_INCLUDE_DIRS}) # Copy the resulting DLL to custom folders after the build # TODO(JBL): This is a convenient way to copy the DLL to the output folder of the .NET project. It has to be seen diff --git a/Src/libCZIAPI_UnitTests/CMakeLists.txt b/Src/libCZIAPI_UnitTests/CMakeLists.txt index 4e715746..62aa0db8 100644 --- a/Src/libCZIAPI_UnitTests/CMakeLists.txt +++ b/Src/libCZIAPI_UnitTests/CMakeLists.txt @@ -21,6 +21,6 @@ ADD_EXECUTABLE(libCZIAPI_UnitTests TARGET_LINK_LIBRARIES(libCZIAPI_UnitTests PRIVATE libCZIAPIStatic GTest::gtest GTest::gmock) target_compile_definitions(libCZIAPI_UnitTests PRIVATE _LIBCZISTATICLIB _LIBCZIAPISTATICLIB) -target_include_directories(libCZIAPI_UnitTests PRIVATE ../libCZIAPI/inc ../libCZI "${RAPIDJSON_INCLUDE_DIRS}") +target_include_directories(libCZIAPI_UnitTests PRIVATE ../libCZIAPI/inc ../libCZI ../libCZI/inc "${RAPIDJSON_INCLUDE_DIRS}") add_test(NAME libCZIAPI_UnitTests COMMAND libCZIAPI_UnitTests) diff --git a/Src/libCZI_UnitTests/inc_libCZI.h b/Src/libCZI_UnitTests/inc_libCZI.h index 65898893..4725911c 100644 --- a/Src/libCZI_UnitTests/inc_libCZI.h +++ b/Src/libCZI_UnitTests/inc_libCZI.h @@ -4,7 +4,7 @@ #pragma once -#include "../libCZI/libCZI.h" +#include #include "../libCZI/splines.h" #include "../libCZI/bitmapData.h" diff --git a/docs/source/pages/version_history.md b/docs/source/pages/version_history.md index 296c82da..1b4ce36a 100644 --- a/docs/source/pages/version_history.md +++ b/docs/source/pages/version_history.md @@ -46,4 +46,5 @@ Version history 0.66.3 | [144](https://github.com/ZEISS/libczi/pull/144) | add (initial and experimental) support for building for UWP (Universal Windows Platform) 0.66.4 | [145](https://github.com/ZEISS/libczi/pull/145) | have embedded pugixml in its own namespace, replace md5sum implementation, update 3rd-party license texts 0.66.5 | [146](https://github.com/ZEISS/libczi/pull/146) | have jxrlib-symbols mangled to prevent conflicts with other libraries - 0.66.6 | [149](https://github.com/ZEISS/libczi/pull/149) | prepare for vcpkg features \ No newline at end of file + 0.66.6 | [149](https://github.com/ZEISS/libczi/pull/149) | prepare for vcpkg features + 0.67.0 | [150](https://github.com/ZEISS/libczi/pull/150) | refactoring folder layout \ No newline at end of file