summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorfengweihao <[email protected]>2023-02-08 22:20:34 +0800
committerfengweihao <[email protected]>2023-02-08 22:20:34 +0800
commitfa4d83dcd7ac520ef8fde9cd3cfedf9fa8d25afe (patch)
treef354aa9c0797ad9363fb01d56d6ce1da30d654e4
parent1e624a3c08095434ad1fce1d4ce9f6a9b21bea38 (diff)
RPM installation package failed to specify installation path
-rw-r--r--.gitlab-ci.yml2
-rw-r--r--src/CMakeLists.txt5
2 files changed, 4 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fd44d79..c9b4d81 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
variables:
GIT_STRATEGY: "clone"
BUILD_PADDING_PREFIX: /tmp/padding_for_CPACK_RPM_BUILD_SOURCE_DIRS_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX_PREFIX/
- INSTALL_PREFIX: "/opt/MESA/lib/"
+ INSTALL_PREFIX: "/opt/MESA/"
INSTALL_DEPENDENCY_LIBRARY: zlib-devel libuuid-devel openssl-devel framework_env
TESTING_VERSION_BUILD: 0
BUILD_IMAGE_CENTOS7: "git.mesalab.cn:7443/mesa_platform/build-env:master"
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index dff3056..4424204 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -57,5 +57,6 @@ target_include_directories(swarmkv-shared PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/in
target_link_libraries(swarmkv-shared CRDT libevent-static libevent-static-pthreads libhdr-static ${SWARMKV_DEPEND_DYN_LIB})
-install(FILES ${PROJECT_SOURCE_DIR}/include/swarmkv/swarmkv.h DESTINATION /opt/MESA/include/MESA/ COMPONENT HEADER)
-install(TARGETS swarmkv-shared LIBRARY DESTINATION /opt/MESA/lib/ COMPONENT library) \ No newline at end of file
+set(CMAKE_INSTALL_PREFIX /opt/MESA/)
+install(FILES ${PROJECT_SOURCE_DIR}/include/swarmkv/swarmkv.h DESTINATION ${CMAKE_INSTALL_PREFIX}/include/MESA/ COMPONENT HEADER)
+install(TARGETS swarmkv-shared LIBRARY DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/ COMPONENT library)