Skip to content

Commit 47a007c

Browse files
committed
Added "datadir" and "docdir" to CMake config.
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.
1 parent b8b4215 commit 47a007c

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

CMake/DCMTKConfig.cmake.in

+8-7
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ set(DCMTK_WIDE_CHAR_MAIN_FUNCTION @DCMTK_WIDE_CHAR_MAIN_FUNCTION@)
6969
set(DCMTK_ENABLE_LFS @DCMTK_ENABLE_LFS@)
7070
set(DCMTK_ENABLE_CHARSET_CONVERSION @DCMTK_ENABLE_CHARSET_CONVERSION@)
7171

72-
7372
# CMake builtins
7473
set(DCMTK_CMAKE_BUILD_TYPE @CMAKE_BUILD_TYPE@)
7574
set(DCMTK_CMAKE_CXX_COMPILER "@CMAKE_CXX_COMPILER@")
@@ -92,15 +91,17 @@ set(DCMTK_CMAKE_EXE_LINKER_FLAGS_RELEASE @CMAKE_EXE_LINKER_FLAGS_RELEASE@)
9291
set(DCMTK_CMAKE_EXE_LINKER_FLAGS_MINSIZEREL @CMAKE_EXE_LINKER_FLAGS_MINSIZEREL@)
9392
set(DCMTK_CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO @CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO@)
9493

95-
set(DCMTK_CMAKE_INSTALL_BINDIR @CMAKE_INSTALL_BINDIR@)
96-
set(DCMTK_CMAKE_INSTALL_SYSCONFDIR @CMAKE_INSTALL_SYSCONFDIR@)
97-
set(DCMTK_CMAKE_INSTALL_INCLUDEDIR @CMAKE_INSTALL_INCLUDEDIR@)
98-
set(DCMTK_CMAKE_INSTALL_LIBDIR @CMAKE_INSTALL_LIBDIR@)
99-
set(DCMTK_CMAKE_INSTALL_DATAROOTDIR @CMAKE_INSTALL_DATAROOTDIR@)
94+
# DCMTK installation directories
95+
set(DCMTK_CMAKE_INSTALL_BINDIR "@CMAKE_INSTALL_BINDIR@")
96+
set(DCMTK_CMAKE_INSTALL_SYSCONFDIR "@CMAKE_INSTALL_SYSCONFDIR@")
97+
set(DCMTK_CMAKE_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@")
98+
set(DCMTK_CMAKE_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@")
99+
set(DCMTK_CMAKE_INSTALL_DATAROOTDIR "@CMAKE_INSTALL_DATAROOTDIR@")
100+
set(DCMTK_CMAKE_INSTALL_DATADIR "@CMAKE_INSTALL_DATADIR@")
101+
set(DCMTK_CMAKE_INSTALL_DOCDIR "@CMAKE_INSTALL_DOCDIR@")
100102

101103
set(DCMTK_CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@")
102104

103-
104105
SET_AND_CHECK(DCMTK_TARGETS "@PACKAGE_DCMTK_CMKDIR_CONFIG@/DCMTKTargets.cmake")
105106

106107
@DCMTK_CONFIG_CODE@

0 commit comments

Comments
 (0)