| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 1 | Backport from Fedora Project. |
| 2 | https://src.fedoraproject.org/rpms/libharu |
| 3 | |
| 4 | Fix the install destination of some files. |
| 5 | |
| Andrew Geissler | 6aa7eec | 2023-03-03 12:41:14 -0600 | [diff] [blame^] | 6 | Upstream-Status: Inappropriate |
| Andrew Geissler | 82c905d | 2020-04-13 13:39:40 -0500 | [diff] [blame] | 7 | |
| 8 | Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> |
| 9 | |
| 10 | diff -urp libharu-RELEASE_2_3_0/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/CMakeLists.txt |
| 11 | --- libharu-RELEASE_2_3_0/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 |
| 12 | +++ libharu-RELEASE_2_3_0_cmake/CMakeLists.txt 2017-06-01 15:56:06.533552795 +0700 |
| 13 | @@ -25,7 +25,7 @@ endif(MSVC) |
| 14 | |
| 15 | # information about libharu |
| 16 | set(LIBHPDF_MAJOR 2) |
| 17 | -set(LIBHPDF_MINOR 2) |
| 18 | +set(LIBHPDF_MINOR 3) |
| 19 | set(LIBHPDF_PATCH 0) |
| 20 | set(LIBHPDF_VERSION ${LIBHPDF_MAJOR}.${LIBHPDF_MINOR}.${LIBHPDF_PATCH}) |
| 21 | set(LIBHPDF_DESCRIPTION "libHaru is a free, cross platform, open source library for generating PDF files.") |
| 22 | @@ -210,9 +210,9 @@ set( |
| 23 | install(FILES ${haru_HDRS} DESTINATION include) |
| 24 | |
| 25 | # install various files |
| 26 | -install(FILES README CHANGES INSTALL DESTINATION .) |
| 27 | +install(FILES README CHANGES INSTALL DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) |
| 28 | if(NOT DEVPAK) |
| 29 | - install(DIRECTORY if DESTINATION .) |
| 30 | + install(DIRECTORY if DESTINATION ${SHARE_INSTALL_PREFIX}/libharu) |
| 31 | endif(NOT DEVPAK) |
| 32 | if(DEVPAK) |
| 33 | install(FILES ${CMAKE_BINARY_DIR}/libharu.DevPackage DESTINATION .) |
| 34 | diff -urp libharu-RELEASE_2_3_0/src/CMakeLists.txt libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt |
| 35 | --- libharu-RELEASE_2_3_0/src/CMakeLists.txt 2013-10-30 20:11:59.000000000 +0700 |
| 36 | +++ libharu-RELEASE_2_3_0_cmake/src/CMakeLists.txt 2017-06-01 16:08:45.425105746 +0700 |
| 37 | @@ -90,11 +90,13 @@ if(LIBHPDF_SHARED) |
| 38 | target_link_libraries(${LIBHPDF_NAME} ${ADDITIONAL_LIBRARIES}) |
| 39 | if(WIN32 AND NOT CYGWIN) |
| 40 | set_target_properties(${LIBHPDF_NAME} PROPERTIES DEFINE_SYMBOL HPDF_DLL_MAKE) |
| 41 | + else(WIN32 AND NOT CYGWIN) |
| 42 | + set_target_properties(${LIBHPDF_NAME} PROPERTIES SOVERSION ${LIBHPDF_VERSION}) |
| 43 | endif(WIN32 AND NOT CYGWIN) |
| 44 | install( |
| 45 | TARGETS ${LIBHPDF_NAME} |
| 46 | - ARCHIVE DESTINATION lib |
| 47 | - LIBRARY DESTINATION lib |
| 48 | + ARCHIVE DESTINATION ${LIB_INSTALL_DIR} |
| 49 | + LIBRARY DESTINATION ${LIB_INSTALL_DIR} |
| 50 | RUNTIME DESTINATION bin |
| 51 | ) |
| 52 | endif(LIBHPDF_SHARED) |