From: Gregory C. Sharp Date: Wed, 15 Jun 2022 19:09:19 +0000 (-0400) Subject: Change CMAKE_INSTALL_DATADIC to CMAKE_INSTALL_DATADIR in an attempt to fix dictionary... X-Git-Tag: archive/raspbian/3.6.9-4+rpi1^2~77 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=7675d6d45381d5d0ec9e176b525e8658c8cc97bf;p=dcmtk.git Change CMAKE_INSTALL_DATADIC to CMAKE_INSTALL_DATADIR in an attempt to fix dictionary load failure --- diff --git a/debian/patches/03_datadic_install.patch b/debian/patches/03_datadic_install.patch index 3de5f5de..8a4acbfe 100644 --- a/debian/patches/03_datadic_install.patch +++ b/debian/patches/03_datadic_install.patch @@ -63,7 +63,7 @@ Author: Mathieu Malaterre +set(DCMTK_INSTALL_DATDIR "share/libdcmtk${DCMTK_ABI_VERSION}") + +install(FILES dcm2xml.dtd dumppat.txt SC.dump VLP.dump DESTINATION "${CMAKE_INSTALL_DATADIR}/dcmtk" COMPONENT data) -+install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${CMAKE_INSTALL_DATADIC} COMPONENT data) ++install(FILES dicom.dic acrnema.dic private.dic diconde.dic DESTINATION ${CMAKE_INSTALL_DATADIR} COMPONENT data) # add paths to the dictionaries to a CMake variable for being used by the unit tests set(DCMTK_DICOM_DICTIONARIES diff --git a/debian/rules b/debian/rules index ecefa16f..50393873 100755 --- a/debian/rules +++ b/debian/rules @@ -38,7 +38,7 @@ CMAKE_EXTRA_FLAGS += -DCMAKE_BUILD_TYPE:STRING=None \ -DDCMTK_WITH_ICU:BOOL=OFF \ -DUSE_COMPILER_HIDDEN_VISIBILITY:BOOL=ON \ -DCMAKE_VERBOSE_MAKEFILE=ON \ - -DCMAKE_INSTALL_DATADIC:STRING=share/libdcmtk17 \ + -DCMAKE_INSTALL_DATADIR:STRING=share/libdcmtk17 \ -DCMAKE_SKIP_RPATH:BOOL=OFF \ -DDCMTK_ENABLE_STL:BOOL=ON \ -DCMAKE_CXX_STANDARD:STRING=17