Gregory Sharp pushed to branch master at Debian Med / dcmtk
Commits: 7675d6d4 by Gregory C. Sharp at 2022-06-15T15:09:19-04:00 Change CMAKE_INSTALL_DATADIC to CMAKE_INSTALL_DATADIR in an attempt to fix dictionary load failure - - - - - 2 changed files: - debian/patches/03_datadic_install.patch - debian/rules Changes: ===================================== debian/patches/03_datadic_install.patch ===================================== @@ -63,7 +63,7 @@ Author: Mathieu Malaterre <[email protected]> +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 ===================================== 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 View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/commit/7675d6d45381d5d0ec9e176b525e8658c8cc97bf -- View it on GitLab: https://salsa.debian.org/med-team/dcmtk/-/commit/7675d6d45381d5d0ec9e176b525e8658c8cc97bf You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
