Add .x86_64 and _amd64 suffixes to .rpm and .debs
Also: * update README documentation * correct postinst scripts for deb and rpm * add lib64/ to link_directories (needed for CentOS and others) * remove a redundant "rdc" from the package names * rearrange the package names to conform to convention For example: rdc-server_1.0.0.0.local-build-0-c3187fb-dirty_amd64.deb rdc-server_1.0.0.0.local-build-0-c3187fb-dirty.x86_64.rpm * fix issues that result from having, in essence, 2 different install prefixes, 1 for the client and 1 for the server. Change-Id: I88f0e1b8b72df2793c35ed71534afd91142da012
这个提交包含在:
+12
-23
@@ -29,33 +29,22 @@ message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
|
||||
|
||||
message("")
|
||||
message("Build Configuration:")
|
||||
message("-----------BuildType: " ${CMAKE_BUILD_TYPE})
|
||||
message("------------Compiler: " ${CMAKE_CXX_COMPILER})
|
||||
message("-------------Version: " ${CMAKE_CXX_COMPILER_VERSION})
|
||||
message("--------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
|
||||
message("--------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
|
||||
message("--------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
|
||||
message("--------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
|
||||
message("--------RSMI Lib Dir: " ${RSMI_LIB_DIR})
|
||||
message("--------RSMI Inc Dir: " ${RSMI_INC_DIR})
|
||||
message("-------GRPC Root Dir: " ${GRPC_ROOT})
|
||||
message("-------------BuildType: " ${CMAKE_BUILD_TYPE})
|
||||
message("--------------Compiler: " ${CMAKE_CXX_COMPILER})
|
||||
message("---------------Version: " ${CMAKE_CXX_COMPILER_VERSION})
|
||||
message("----------Proj Src Dir: " ${PROJECT_SOURCE_DIR})
|
||||
message("----------Proj Bld Dir: " ${PROJECT_BINARY_DIR})
|
||||
message("----------Proj Lib Dir: " ${PROJECT_BINARY_DIR}/lib)
|
||||
message("----------Proj Exe Dir: " ${PROJECT_BINARY_DIR}/bin)
|
||||
message("----------RSMI Lib Dir: " ${RSMI_LIB_DIR})
|
||||
message("----------RSMI Inc Dir: " ${RSMI_INC_DIR})
|
||||
message("---------GRPC Root Dir: " ${GRPC_ROOT})
|
||||
message("---Server Install Path: " ${RDC_SERVER_ROOT_PATH})
|
||||
message("")
|
||||
|
||||
set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}
|
||||
CACHE STRING "Location of RDC client library source code.")
|
||||
|
||||
message("CMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}")
|
||||
message("CPACK_PACKAGING_INSTALL_PREFIX=${CPACK_PACKAGING_INSTALL_PREFIX}")
|
||||
if (NOT DEFINED CMAKE_INSTALL_PREFIX)
|
||||
set(CMAKE_INSTALL_PREFIX ${RDC_SERVER_ROOT_PATH}
|
||||
CACHE STRING "Default installation directory.")
|
||||
endif()
|
||||
|
||||
if (NOT DEFINED CPACK_PACKAGING_INSTALL_PREFIX)
|
||||
set(CPACK_PACKAGING_INSTALL_PREFIX ${RDC_SERVER_ROOT_PATH}
|
||||
CACHE STRING "Default packaging prefix.")
|
||||
endif()
|
||||
|
||||
## Compiler flags
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wextra -m64")
|
||||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse -msse2 -std=c++11 ")
|
||||
@@ -94,7 +83,7 @@ message("SERVER_SRC_LIST=${SERVER_SRC_LIST}")
|
||||
set(SERVER_DAEMON_EXE "rdcd")
|
||||
set(SERVICE_FILE_NAME "rdc.service")
|
||||
|
||||
link_directories(${RSMI_LIB_DIR} ${GRPC_ROOT}/lib)
|
||||
link_directories(${RSMI_LIB_DIR} "${GRPC_ROOT}/lib" "${GRPC_ROOT}/lib64")
|
||||
|
||||
add_executable(${SERVER_DAEMON_EXE} "${SERVER_SRC_LIST}")
|
||||
# target_include_directories(${SERVER_DAEMON_EXE} PUBLIC ${RSMI_INC_DIR})
|
||||
|
||||
在新工单中引用
屏蔽一个用户