From fdd5934e7e71e1016cf3bbafbe4bdba2f9053f9f Mon Sep 17 00:00:00 2001 From: xibowen Date: Tue, 7 Feb 2023 20:03:29 +0800 Subject: [PATCH] fix pdebuilde error --- CMakeLists.txt | 2 +- debian/libkysdk-log.install | 5 +++-- debian/libkysdk-utils.install | 6 +++--- src/utils/data-structure/CMakeLists.txt | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2672239..89bf8fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,6 +30,6 @@ set (LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib) set (EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin) set (CMAKE_INSTALL_PREFIX /usr) -set (CMAKE_INSTALL_RPATH /usr/lib/x86_64-linux-gnu/kysdk/kysdk-base) +set (CMAKE_INSTALL_RPATH /usr/lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/kysdk/kysdk-base) add_subdirectory(src) diff --git a/debian/libkysdk-log.install b/debian/libkysdk-log.install index dafcdbb..4d227cc 100644 --- a/debian/libkysdk-log.install +++ b/debian/libkysdk-log.install @@ -1,5 +1,6 @@ src/log/kylog-default.conf etc/kysdk/kysdk-base src/log/kylog-rotate-default etc/kysdk/kysdk-base src/log/logrotate.cron etc/kysdk/kysdk-base -usr/lib/*/kysdk/kysdk-base/*.so* -#usr/lib/*/kysdk/kysdk-base/libkylog.so* +#usr/lib/*/kysdk/kysdk-base/*.so* +#usr/lib/*/kysdk/kysdk-base/libkyconf.so* +usr/lib/*/kysdk/kysdk-base/libkylog.so* diff --git a/debian/libkysdk-utils.install b/debian/libkysdk-utils.install index d46b9ba..17ea5ec 100644 --- a/debian/libkysdk-utils.install +++ b/debian/libkysdk-utils.install @@ -1,3 +1,3 @@ -usr/lib/*/kysdk/kysdk-base/*.so* -#usr/lib/*/kysdk/kysdk-base/libkydatastruct.so* -#usr/lib/*/kysdk/kysdk-base/libkyutils.so* +#usr/lib/*/kysdk/kysdk-base/*.so* +usr/lib/*/kysdk/kysdk-base/libkydatastruct.so* +usr/lib/*/kysdk/kysdk-base/libkyutils.so* diff --git a/src/utils/data-structure/CMakeLists.txt b/src/utils/data-structure/CMakeLists.txt index 5ccc6b0..ff58dcd 100644 --- a/src/utils/data-structure/CMakeLists.txt +++ b/src/utils/data-structure/CMakeLists.txt @@ -14,4 +14,4 @@ target_link_libraries(test-insert kydatastruct) target_link_libraries(test-search kydatastruct) install(TARGETS kydatastruct - DESTINATION lib/kysdk/kysdk-base) \ No newline at end of file + DESTINATION lib/${CMAKE_HOST_SYSTEM_PROCESSOR}-linux-gnu/kysdk/kysdk-base)