diff options
| author | Dominik Schmidt <dev@dominik-schmidt.de> | 2012-04-26 18:55:14 +0400 |
|---|---|---|
| committer | Dominik Schmidt <dev@dominik-schmidt.de> | 2012-04-26 18:55:14 +0400 |
| commit | f02a01871158e2d4ba7d62a73432fa5aeda940fb (patch) | |
| tree | ab09d25a050bbfc5460bb9306cc3a9c133bd924d | |
| parent | b5f43a89ea9004150a4052337ea39aa319c5c7bd (diff) | |
win: remove klaasi haasi's harcoded paths from the nsi
| -rw-r--r-- | CPackOptions.cmake.in | 9 | ||||
| -rw-r--r-- | cmake/modules/NSIS.template.in | 8 |
2 files changed, 12 insertions, 5 deletions
diff --git a/CPackOptions.cmake.in b/CPackOptions.cmake.in index 29ed9a19b..cc9fa477c 100644 --- a/CPackOptions.cmake.in +++ b/CPackOptions.cmake.in @@ -7,5 +7,10 @@ if(CPACK_GENERATOR MATCHES "NSIS") SET( CPACK_NSIS_COMPRESSOR "/SOLID lzma" ) # The arguments that will be passed to the NSIS SetCompressor command. /SOLID lzma endif(CPACK_GENERATOR MATCHES "NSIS") -SET( CMAKE_SOURCE_DIR @CMAKE_SOURCE_DIR@ ) -SET( CMAKE_BINARY_DIR @CMAKE_BINARY_DIR@ )
\ No newline at end of file +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") +endif() diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 1c3b7bae7..f29843347 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -33,6 +33,8 @@ !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 NSI_PATH "${SOURCE_PATH}/admin/win/nsi" ;----------------------------------------------------------------------------- @@ -282,7 +284,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 "/home/kf/owncloud.com/win/buildcsync/modules/csync_owncloud.dll" + File "${CSYNC_BINARY_DIR}/modules/csync_owncloud.dll" SetOutPath "$INSTDIR" !endif @@ -298,7 +300,7 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD_PLAYER File "${QT_DLL_PATH}\QtNetwork4.dll" File "${QT_DLL_PATH}\QtXml4.dll" - File "/home/kf/owncloud.com/win/buildcsync/src/libcsync.dll" + File "${CSYNC_BINARY_DIR}/src/libcsync.dll" File "${MING_BIN}\libsqlite3-0.dll" File "${MING_BIN}\libiniparser.dll" File "${MING_BIN}\libdl.dll" @@ -325,7 +327,7 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD_PLAYER File "${MING_BIN}\libssl-8.dll" ; CSync configs - File "/home/kf/owncloud.com/win/csync/config/csync.conf" + File "${CSYNC_BINARY_DIR}/config/csync.conf" File "${SOURCE_PATH}/exclude.lst" SectionEnd |