Skip to content

Commit

Permalink
Added "datadir" and "docdir" to CMake config.
Browse files Browse the repository at this point in the history
Added CMake variables CMAKE_INSTALL_DATADIR and CMAKE_INSTALL_DOCDIR
to the DCMTK configuration that is exported to "DCMTKConfig.cmake".
This is particularly important as both paths usually contain the DCMTK
version number, which might not be known to the project that imports
the DCMTK configuration.

Also added quotation marks to all exported installation subdirectories
so that spaces and other "special" characters are supported.
  • Loading branch information
jriesmeier committed Feb 11, 2025
1 parent b8b4215 commit 47a007c
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions CMake/DCMTKConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,6 @@ set(DCMTK_WIDE_CHAR_MAIN_FUNCTION @DCMTK_WIDE_CHAR_MAIN_FUNCTION@)
set(DCMTK_ENABLE_LFS @DCMTK_ENABLE_LFS@)
set(DCMTK_ENABLE_CHARSET_CONVERSION @DCMTK_ENABLE_CHARSET_CONVERSION@)


# CMake builtins
set(DCMTK_CMAKE_BUILD_TYPE @CMAKE_BUILD_TYPE@)
set(DCMTK_CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@")
Expand All @@ -92,15 +91,17 @@ set(DCMTK_CMAKE_EXE_LINKER_FLAGS_RELEASE @CMAKE_EXE_LINKER_FLAGS_RELEASE@)
set(DCMTK_CMAKE_EXE_LINKER_FLAGS_MINSIZEREL @CMAKE_EXE_LINKER_FLAGS_MINSIZEREL@)
set(DCMTK_CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO @CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO@)

set(DCMTK_CMAKE_INSTALL_BINDIR @CMAKE_INSTALL_BINDIR@)
set(DCMTK_CMAKE_INSTALL_SYSCONFDIR @CMAKE_INSTALL_SYSCONFDIR@)
set(DCMTK_CMAKE_INSTALL_INCLUDEDIR @CMAKE_INSTALL_INCLUDEDIR@)
set(DCMTK_CMAKE_INSTALL_LIBDIR @CMAKE_INSTALL_LIBDIR@)
set(DCMTK_CMAKE_INSTALL_DATAROOTDIR @CMAKE_INSTALL_DATAROOTDIR@)
# DCMTK installation directories
set(DCMTK_CMAKE_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@")
set(DCMTK_CMAKE_INSTALL_SYSCONFDIR "@CMAKE_INSTALL_SYSCONFDIR@")
set(DCMTK_CMAKE_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@")
set(DCMTK_CMAKE_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")
set(DCMTK_CMAKE_INSTALL_DATAROOTDIR "@CMAKE_INSTALL_DATAROOTDIR@")
set(DCMTK_CMAKE_INSTALL_DATADIR "@CMAKE_INSTALL_DATADIR@")
set(DCMTK_CMAKE_INSTALL_DOCDIR "@CMAKE_INSTALL_DOCDIR@")

set(DCMTK_CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")


SET_AND_CHECK(DCMTK_TARGETS "@PACKAGE_DCMTK_CMKDIR_CONFIG@/DCMTKTargets.cmake")

@DCMTK_CONFIG_CODE@
Expand Down

0 comments on commit 47a007c

Please sign in to comment.