mirror of
https://git.code.sf.net/p/zint/code
synced 2025-05-09 05:32:03 -04:00
Fix installation of cmake files
When binaries, libs and development files like include or cmake files are installed to different target directories then those where before relatively installed to the binary and not in the correct directory where other development related files where installed. Tested inside of nixpkgs with zxing using the system library of zint.
This commit is contained in:
parent
8758ebd420
commit
9265abd9e1
2 changed files with 2 additions and 2 deletions
|
@ -201,4 +201,4 @@ if(ZINT_UNINSTALL)
|
|||
endif()
|
||||
|
||||
configure_file("zint-config.cmake.in" "zint-config.cmake" @ONLY)
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zint-config.cmake" DESTINATION "${CMAKE_INSTALL_DATADIR}/zint")
|
||||
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/zint-config.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/zint")
|
||||
|
|
|
@ -131,7 +131,7 @@ endif()
|
|||
if(ZINT_STATIC)
|
||||
install(TARGETS zint-static EXPORT zint-targets ${INSTALL_TARGETS_DEFAULT_ARGS})
|
||||
endif()
|
||||
install(EXPORT zint-targets NAMESPACE zint:: DESTINATION "${CMAKE_INSTALL_DATADIR}/zint")
|
||||
install(EXPORT zint-targets NAMESPACE zint:: DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/zint")
|
||||
install(FILES zint.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT Devel)
|
||||
|
||||
if(ZINT_TEST)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue