diff options
| author | Karol Lewandowski <k.lewandowsk@samsung.com> | 2019-09-26 21:42:09 +0200 |
|---|---|---|
| committer | Karol Lewandowski <k.lewandowsk@samsung.com> | 2019-09-26 21:42:09 +0200 |
| commit | d70d319d3809e38e0c6e42c40944aaf57ce26975 (patch) | |
| tree | 19b100c57baac9e124397048d64e95e22cfbfd82 | |
| parent | 13980ada22fd9baec2d7aaab7b46877e660631fb (diff) | |
| download | crash-worker-d70d319d3809e38e0c6e42c40944aaf57ce26975.tar.gz crash-worker-d70d319d3809e38e0c6e42c40944aaf57ce26975.tar.bz2 crash-worker-d70d319d3809e38e0c6e42c40944aaf57ce26975.zip | |
Fix compilation on 64-bit architecturessubmit/tizen/20190927.061310submit/tizen/20190926.222014
64-bit architetures have lib in lib64, fix this by using
cmake-provided information about target system directories.
Change-Id: I794c89ad06b7bd80acd50acd3e64a36ffe86ea5d
| -rw-r--r-- | packaging/crash-worker.spec | 4 | ||||
| -rw-r--r-- | src/crash-manager/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/crash-service/CMakeLists.txt | 8 |
3 files changed, 11 insertions, 7 deletions
diff --git a/packaging/crash-worker.spec b/packaging/crash-worker.spec index 1349392..baa227e 100644 --- a/packaging/crash-worker.spec +++ b/packaging/crash-worker.spec @@ -247,11 +247,11 @@ sed -i "/${pattern}/D" %{_sysconfdir}/ld.so.preload %files devel %{_includedir}/crash-manager.h %{_libdir}/libcrash-manager.so -%{_datadir}/pkgconfig/crash-manager.pc +%{_libdir}/pkgconfig/crash-manager.pc %if %{with crashservice} %{_includedir}/libcrash-service.h %{_libdir}/libcrash-service.so -%{_datadir}/pkgconfig/crash-service.pc +%{_libdir}/pkgconfig/crash-service.pc %endif %if %{with doc} diff --git a/src/crash-manager/CMakeLists.txt b/src/crash-manager/CMakeLists.txt index b935621..b38a084 100644 --- a/src/crash-manager/CMakeLists.txt +++ b/src/crash-manager/CMakeLists.txt @@ -14,6 +14,8 @@ SET(CRASH_MANAGER_SRCS main.c ) +INCLUDE(GNUInstallDirs) + INCLUDE(FindPkgConfig) pkg_check_modules(crash-manager_pkgs REQUIRED dlog @@ -53,7 +55,7 @@ ADD_EXECUTABLE(${CRASH_NOTIFY} dbus_notify.c) TARGET_LINK_LIBRARIES(${CRASH_NOTIFY} ${helper_pkgs_LDFLAGS} -pie) install(TARGETS ${CRASH_NOTIFY} DESTINATION libexec) -INSTALL(TARGETS libcrash-manager LIBRARY DESTINATION lib PUBLIC_HEADER DESTINATION include) +INSTALL(TARGETS libcrash-manager LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE @@ -68,7 +70,7 @@ INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}/crash-manager.conf PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}/crash-manager.pc - DESTINATION share/pkgconfig + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig PERMISSIONS OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ) INSTALL(FILES ${CMAKE_SOURCE_DIR}/src/${PROJECT_NAME}/70-${PROJECT_NAME}.conf diff --git a/src/crash-service/CMakeLists.txt b/src/crash-service/CMakeLists.txt index 37ad6b1..a8de738 100644 --- a/src/crash-service/CMakeLists.txt +++ b/src/crash-service/CMakeLists.txt @@ -7,6 +7,8 @@ SET(CRASH_SERVICE_SRCS crash-service.c ) +INCLUDE(GNUInstallDirs) + INCLUDE(FindPkgConfig) pkg_check_modules(crash-service_pkgs REQUIRED @@ -53,8 +55,8 @@ INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -INSTALL(TARGETS libcrash-service LIBRARY DESTINATION /usr/lib/ - PUBLIC_HEADER DESTINATION /usr/include) +INSTALL(TARGETS libcrash-service LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/crash-service.pc - DESTINATION share/pkgconfig) + DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) |