Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix Windows client package

This commit is contained in:
KVS85 2019-09-17 01:52:26 +02:00
parent 999e4b8873
commit 5e40f58084
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
arangosh/install.cmake
View File

@ -4,6 +4,9 @@
set(STRIP_DIR "${CMAKE_RUNTIME_OUTPUT_DIRECTORY_X}/cstrip")
add_custom_target(strip_install_client ALL)
if (${USE_ENTERPRISE})
strip_install_bin_and_config(arangobackup ${STRIP_DIR} ${CMAKE_INSTALL_BINDIR} strip_install_client)
endif ()
strip_install_bin_and_config(arangobench ${STRIP_DIR} ${CMAKE_INSTALL_BINDIR} strip_install_client)
strip_install_bin_and_config(arangodump ${STRIP_DIR} ${CMAKE_INSTALL_BINDIR} strip_install_client)
strip_install_bin_and_config(arangoimport ${STRIP_DIR} ${CMAKE_INSTALL_BINDIR} strip_install_client)

5
cmake/packages/client/nsis.txt
View File

@ -13,11 +13,13 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "@CMAKE_BINARY_DIR@/bin")
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_X "@CMAKE_BINARY_DIR@/bin/$<CONFIG>/")
set(CMAKE_BUILD_TYPE @CMAKE_BUILD_TYPE@)
set(USE_ENTERPRISE @USE_ENTERPRISE@)
################################################################################
# Substitute the install binaries:
################################################################################
set(BIN_ARANGOBACKUP @BIN_ARANGOBACKUP@)
set(BIN_ARANGOBENCH @BIN_ARANGOBENCH@)
set(BIN_ARANGODUMP @BIN_ARANGODUMP@)
set(BIN_ARANGOEXPORT @BIN_ARANGOEXPORT@)
@ -72,7 +74,7 @@ set(INSTALL_ICU_DT_DEST "@INSTALL_ICU_DT_DEST@")
set(CPACK_PACKAGE_VERSION "${ARANGODB_VERSION}")
set(CPACK_PACKAGE_CONTACT ${ARANGODB_PACKAGE_CONTACT})
if (USE_ENTERPRISE)
if (${USE_ENTERPRISE})
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/enterprise/LICENSE")
else ()
set(CPACK_RESOURCE_FILE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE")
@ -139,6 +141,7 @@ set(CPACK_NSIS_MUI_ICON ${ARANGO_ICON})
set(CPACK_NSIS_MUI_UNIICON ${ARANGO_ICON})
set(CPACK_NSIS_INSTALLED_ICON_NAME ${RELATIVE_ARANGO_ICON})
message(STATUS "USE_ENTERPRISE: ${USE_ENTERPRISE}")
message(STATUS "RELATIVE_ARANGO_ICON: ${RELATIVE_ARANGO_ICON}")
message(STATUS "ARANGO_IMG: ${ARANGO_IMG}")
message(STATUS "ARANGO_ICON: ${ARANGO_ICON}")