Ship arangoinspect with Windows client package and DDLs only once (ar…

…angodb#10835) * install inspector into client package too * Remove blank line * UNTESTED: Don't ship DLLs in bin/ a second time * Update comment * Re-arrange lines * Minor * Minor * fix installation * CHANGELOG * Update CHANGELOG Co-authored-by: Simran <Simran-B@users.noreply.github.com> Co-authored-by: KVS85 <vadim@arangodb.com>
dcosta72 · Jan 13, 2020 · 99fa8f3 · 99fa8f3
1 parent fd73fd9
commit 99fa8f3
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 devel
 -----
 
+* Fix installation of arangoinspect and libraries in Windows client installer.
+
 * Now clearing an internal map inside the traverser engine correctly.
 
 * Ported `/_admin/cluster*` API to C++.

diff --git a/arangosh/install.cmake b/arangosh/install.cmake
@@ -19,3 +19,8 @@ install_command_alias(${BIN_ARANGOSH}
   ${CMAKE_INSTALL_BINDIR}
   foxx-manager)
 install_config(foxx-manager)
+
+install_command_alias(${BIN_ARANGOSH}
+  ${CMAKE_INSTALL_BINDIR}
+  arangoinspect)
+install_config(arangoinspect)
diff --git a/cmake/ArangoDBInstall.cmake b/cmake/ArangoDBInstall.cmake
@@ -259,8 +259,8 @@ install(FILES "${CMAKE_SOURCE_DIR}/Installation/arangodb-helper"
 
 
 if (MSVC AND NOT(SKIP_PACKAGING))
-  # so we don't need to ship dll's twice, make it one directory:
   include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/InstallMacros.cmake)
+  # Make it the same directory so we don't ship DLLs twice (in bin/ on top of usr/bin/):
   set(CMAKE_INSTALL_FULL_SBINDIR     "${CMAKE_INSTALL_FULL_BINDIR}")
 
   install_readme(README.windows README.windows.txt)

diff --git a/cmake/InstallMacros.cmake b/cmake/InstallMacros.cmake
@@ -88,7 +88,7 @@ if (INSTALL_MACROS_NO_TARGET_INSTALL)
   macro (install_command_alias name where alias)
     if (MSVC)
       add_custom_command(
-        OUTPUT ${name}
+        OUTPUT ${alias}
         POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:${name}>
 	${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/$<CONFIG>/${alias}${CMAKE_EXECUTABLE_SUFFIX})
@@ -97,7 +97,7 @@ if (INSTALL_MACROS_NO_TARGET_INSTALL)
         DESTINATION ${where})
     else ()
       add_custom_command(
-        OUTPUT ${name}
+        OUTPUT ${alias}
         POST_BUILD
         COMMAND ${CMAKE_COMMAND} -E create_symlink ${name}
         ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${alias}) 

diff --git a/cmake/packages/client/nsis.txt b/cmake/packages/client/nsis.txt
@@ -116,8 +116,8 @@ set(CMAKE_INSTALL_FULL_DATAROOTDIR_ARANGO "${CMAKE_INSTALL_FULL_DATAROOTDIR}/ara
 set(INSTALL_MACROS_NO_TARGET_INSTALL TRUE)
 include(${ORIGINAL_SOURCE_DIR}/cmake/InstallMacros.cmake)
 
-
 # install the visual studio runtime:
+set(CMAKE_INSTALL_SYSTEM_RUNTIME_DESTINATION "${CMAKE_INSTALL_BINDIR}")
 set(CMAKE_INSTALL_UCRT_LIBRARIES 1)
 include(InstallRequiredSystemLibraries)
 INSTALL(FILES ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Libraries)