addressed review comments
This commit is contained in:
parent
7188c82cb0
commit
703b2e276a
|
@ -8,6 +8,8 @@ endfunction()
|
|||
|
||||
function(install_symlink_impl)
|
||||
if (NOT WIN32)
|
||||
return()
|
||||
endif()
|
||||
set(options "")
|
||||
set(one_value_options TO DESTINATION)
|
||||
set(multi_value_options COMPONENTS)
|
||||
|
@ -21,11 +23,12 @@ function(install_symlink_impl)
|
|||
foreach(component IN LISTS SYM_COMPONENTS)
|
||||
install(FILES ${sl} DESTINATION ${dest_dir} COMPONENT ${component})
|
||||
endforeach()
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
function(install_symlink)
|
||||
if(NOT WIN32 AND NOT OPEN_FOR_IDE)
|
||||
return()
|
||||
endif()
|
||||
set(options "")
|
||||
set(one_value_options COMPONENT LINK_DIR FILE_DIR LINK_NAME FILE_NAME)
|
||||
set(multi_value_options "")
|
||||
|
@ -45,7 +48,7 @@ function(install_symlink)
|
|||
install_symlink_impl(
|
||||
TO "../${rel_path}bin/${IN_FILE_NAME}"
|
||||
DESTINATION "usr/lib64/${IN_LINK_NAME}"
|
||||
COMPONENTS "${IN_COMPONENT}-el6"
|
||||
COMPONENTS
|
||||
"${IN_COMPONENT}-el7"
|
||||
"${IN_COMPONENT}-deb")
|
||||
install_symlink_impl(
|
||||
|
@ -60,7 +63,7 @@ function(install_symlink)
|
|||
install_symlink_impl(
|
||||
TO "../${rel_path}bin/${IN_FILE_NAME}"
|
||||
DESTINATION "usr/bin/${IN_LINK_NAME}"
|
||||
COMPONENTS "${IN_COMPONENT}-el6"
|
||||
COMPONENTS
|
||||
"${IN_COMPONENT}-el7"
|
||||
"${IN_COMPONENT}-deb")
|
||||
elseif("${IN_LINK_DIR}" MATCHES "fdbmonitor")
|
||||
|
@ -71,7 +74,7 @@ function(install_symlink)
|
|||
install_symlink_impl(
|
||||
TO "../../${rel_path}bin/${IN_FILE_NAME}"
|
||||
DESTINATION "usr/lib/foundationdb/${IN_LINK_NAME}"
|
||||
COMPONENTS "${IN_COMPONENT}-el6"
|
||||
COMPONENTS
|
||||
"${IN_COMPONENT}-el7"
|
||||
"${IN_COMPONENT}-deb")
|
||||
else()
|
||||
|
@ -80,7 +83,6 @@ function(install_symlink)
|
|||
else()
|
||||
message(FATAL_ERROR "Unknown FILE_DIR ${IN_FILE_DIR}")
|
||||
endif()
|
||||
endif()
|
||||
endfunction()
|
||||
|
||||
function(symlink_files)
|
||||
|
|
|
@ -5,7 +5,7 @@ Release Notes
|
|||
#############
|
||||
|
||||
6.3.10
|
||||
=====
|
||||
======
|
||||
|
||||
Packaging
|
||||
---------
|
||||
|
|
|
@ -1,5 +1,18 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
CMAKE_CONFIG_DIR="/usr/@LIB_DIR@/cmake"
|
||||
PKG_CONFIG_DIR="/usr/@LIB_DIR@/pkgconfig"
|
||||
|
||||
if [ ! -d "${CMAKE_CONFIG_DIR}" ]
|
||||
then
|
||||
mkdir "${CMAKE_CONFIG_DIR}"
|
||||
fi
|
||||
if [ ! -d "${PKG_CONFIG_DIR}" ]
|
||||
then
|
||||
mkdir ${PKG_CONFIG_DIR}
|
||||
fi
|
||||
|
||||
|
||||
alternatives --install /usr/bin/fdbcli fdbclients /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbcli @ALTERNATIVES_PRIORITY@ \
|
||||
--slave /usr/bin/fdbbackup fdbbackup /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbbackup \
|
||||
--slave /usr/bin/fdbrestore fdbrestore /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbbackup \
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
alternatives --remove fdbclients /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbcli @ALTERNATIVES_PRIORITY@
|
||||
alternatives --remove fdbclients /usr/lib/foundationdb-@PROJECT_VERSION@/bin/fdbcli
|
||||
|
|
Loading…
Reference in New Issue