opensourcemirror
/
nextcloud-desktop
mirror of https://github.com/nextcloud/desktop.git
1
0
Fork 0
Code Issues Releases Wiki Activity

win: allow building the installer from local csync build dir and from installed csync as well

This commit is contained in:
Dominik Schmidt 2012-04-26 17:16:34 +02:00
parent f02a018711
commit f96fa3dbeb
2 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
CPackOptions.cmake.in
View File

@ -10,7 +10,15 @@ endif(CPACK_GENERATOR MATCHES "NSIS")
set( CMAKE_SOURCE_DIR @CMAKE_SOURCE_DIR@ )
set( CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@ )
set( CSYNC_BINARY_DIR @CSYNC_BINARY_DIR@ )
if(NOT CSYNC_BINARY_DIR)
message(FATAL_ERROR "You need to make CSYNC_BINARY_DIR point to the csync build dir")
set( MINGW_ROOT @CMAKE_FIND_ROOT_PATH@ )
if(CSYNC_BINARY_DIR)
set( CSYNC_LIBRARY_DIR "${CSYNC_BINARY_DIR}/src" )
set( CSYNC_PLUGIN_DIR "${CSYNC_BINARY_DIR}/modules" )
set( CSYNC_CONFIG_DIR "${CSYNC_BINARY_DIR}/config" )
else()
set( CSYNC_LIBRARY_DIR "${MINGW_ROOT}/bin" )
set( CSYNC_PLUGIN_DIR "${MINGW_ROOT}/bin/csync-0" ) #FIXME: whatever it is
set( CSYNC_CONFIG_DIR "${MINGW_ROOT}/etc/csync" )
endif()

10
cmake/modules/NSIS.template.in
View File

@ -33,7 +33,9 @@
!define SQLITE_DLL_PATH "${MING_LIB}/qt4/plugins/sqldrivers"
!define IMAGEFORMATS_DLL_PATH "${MING_LIB}/qt4/plugins/imageformats"
!define CSYNC_BINARY_DIR "@CSYNC_BINARY_DIR@"
!define CSYNC_LIBRARY_DIR "@CSYNC_LIBRARY_DIR@"
!define CSYNC_PLUGIN_DIR "@CSYNC_PLUGIN_DIR@"
!define CSYNC_CONFIG_DIR "@CSYNC_CONFIG_DIR@"
!define NSI_PATH "${SOURCE_PATH}/admin/win/nsi"
@ -284,7 +286,7 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD_PLAYER
; FIXME: fix installation dir of module, currently needs manual copying to
; /usr/i686-w64-mingw32/sys-root/mingw/bin/csync_modules/
File "${CSYNC_BINARY_DIR}/modules/csync_owncloud.dll"
File "${CSYNC_PLUGIN_DIR}/csync_owncloud.dll"
SetOutPath "$INSTDIR"
!endif
@ -300,7 +302,7 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD_PLAYER
File "${QT_DLL_PATH}\QtNetwork4.dll"
File "${QT_DLL_PATH}\QtXml4.dll"
File "${CSYNC_BINARY_DIR}/src/libcsync.dll"
File "${CSYNC_LIBRARY_DIR}/libcsync.dll"
File "${MING_BIN}\libsqlite3-0.dll"
File "${MING_BIN}\libiniparser.dll"
File "${MING_BIN}\libdl.dll"
@ -327,7 +329,7 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD_PLAYER
File "${MING_BIN}\libssl-8.dll"
; CSync configs
File "${CSYNC_BINARY_DIR}/config/csync.conf"
File "${CSYNC_CONFIG_DIR}/csync.conf"
File "${SOURCE_PATH}/exclude.lst"
SectionEnd