diff options
| author | Dominik Schmidt <dev@dominik-schmidt.de> | 2012-04-26 19:16:34 +0400 |
|---|---|---|
| committer | Dominik Schmidt <dev@dominik-schmidt.de> | 2012-04-26 19:16:34 +0400 |
| commit | f96fa3dbeb4064160cdcd829ae1bf221486d0048 (patch) | |
| tree | 75f56d052f65726cc737f23e20da10cd60809ae9 | |
| parent | f02a01871158e2d4ba7d62a73432fa5aeda940fb (diff) | |
win: allow building the installer from local csync build dir and from installed csync as well
| -rw-r--r-- | CPackOptions.cmake.in | 12 | ||||
| -rw-r--r-- | cmake/modules/NSIS.template.in | 10 |
2 files changed, 16 insertions, 6 deletions
diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in index cc9fa477c..3145ce5cd 100644 --- a/CPackOptions.cmake.in +++ b/CPackOptions.cmake.in @@ -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() diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index f29843347..b4d25d93e 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -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 |