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

Properly reference the plugins.

This commit is contained in:
Wilfried Goesgens 2016-05-25 14:44:27 +02:00
parent 8158b924d9
commit 0a3a4f191b
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Installation/Windows/Templates/NSIS.template.in
View File

@ -1,9 +1,9 @@
; CPack install script designed for a nmake build
!addplugindir '..\..\..\..\Installation\Windows\Plugins\NSIS_Simple_Service_Plugin_1.30'
!addplugindir '..\..\..\..\Installation\Windows\Plugins\UAC-plug-in-NSIS\Ansi'
!addplugindir '..\..\..\..\Installation\Windows\Plugins\AccessControl\Plugins'
!addplugindir '..\..\..\..\Installation\Windows\Plugins\SharedMemory\Plugins'
!addincludedir '..\..\..\..\Installation\Windows\Plugins\UAC-plug-in-NSIS'
!addplugindir '@CPACK_PLUGIN_PATH@\Plugins\NSIS_Simple_Service_Plugin_1.30'
!addplugindir '@CPACK_PLUGIN_PATH@\Plugins\UAC-plug-in-NSIS\Ansi'
!addplugindir '@CPACK_PLUGIN_PATH@\Plugins\AccessControl\Plugins'
!addplugindir '@CPACK_PLUGIN_PATH@\Plugins\SharedMemory\Plugins'
!addincludedir '@CPACK_PLUGIN_PATH@\Plugins\UAC-plug-in-NSIS'
;--------------------------------
; Include LogicLib for more readable code

1
cmake/ArangoDBMacros.cmake
View File

@ -313,6 +313,7 @@ set(CPACK_BUNDLE_STARTUP_COMMAND "${PROJECT_SOURCE_DIR}/Installation/MacOSX/Bund
if (MSVC)
set(CPACK_PACKAGE_NAME "ArangoDB")
set(CPACK_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Installation/Windows/Templates")
set(CPACK_PLUGIN_PATH "${CMAKE_CURRENT_SOURCE_DIR}/Installation/Windows/Plugins")
set(CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL 1)
set(BITS 64)