diff options
| author | Klaas Freitag <freitag@owncloud.com> | 2012-10-02 14:34:06 +0400 |
|---|---|---|
| committer | Klaas Freitag <freitag@owncloud.com> | 2012-10-02 14:34:06 +0400 |
| commit | de60d53a78a01ce35ded78a2967784107c063a58 (patch) | |
| tree | 83c5e03deeb389611b343e0e80957b92b07227a3 /cmake | |
| parent | 5587da946fa982714db8824249d777c9f950d526 (diff) | |
| parent | c24728b692b39e2aeafaaa7ab200fb9f66f2c5ac (diff) | |
Merge branch 'sslerrordialog' of https://github.com/sebasje/mirall into sebasje-sslerrordialog
Conflicts:
src/mirall/application.cpp
src/mirall/application.h
src/mirall/owncloudinfo.cpp
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/modules/FindCsync.cmake | 4 | ||||
| -rw-r--r-- | cmake/modules/NSIS.template.in | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cmake/modules/FindCsync.cmake b/cmake/modules/FindCsync.cmake index 9b0c11e8e..3e0868d3a 100644 --- a/cmake/modules/FindCsync.cmake +++ b/cmake/modules/FindCsync.cmake @@ -6,9 +6,9 @@ ENDIF() IF(EXISTS "${CMAKE_SOURCE_DIR}/../buildcsync/src/") IF( WIN32 ) - SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/../win/buildcsync/src/libcsync.dll) + SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/../win/buildcsync/src/libocsync.dll) ELSE( WIN32 ) - SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/../buildcsync/src/libcsync.so) + SET(CSYNC_LIBRARY ${CMAKE_SOURCE_DIR}/../buildcsync/src/libocsync.so) ENDIF( WIN32 ) ELSE() FIND_LIBRARY(CSYNC_LIBRARY NAMES csync HINTS $ENV{CSYNC_DIR}) diff --git a/cmake/modules/NSIS.template.in b/cmake/modules/NSIS.template.in index 0fc6ad8ce..4c0e0ad54 100644 --- a/cmake/modules/NSIS.template.in +++ b/cmake/modules/NSIS.template.in @@ -321,7 +321,7 @@ Section "${APPLICATION_NAME}" SEC_OWNCLOUD File "${QT_DLL_PATH}\QtNetwork4.dll" File "${QT_DLL_PATH}\QtXml4.dll" - File "${CSYNC_LIBRARY_DIR}/libcsync.dll" + File "${CSYNC_LIBRARY_DIR}/libocsync.dll" File "${MING_BIN}\libsqlite3-0.dll" File "${MING_BIN}\libiniparser.dll" File "${MING_BIN}\libdl.dll" |