Commit graph

16 commits

Author SHA1 Message Date
Daniel Molkentin
62a36cd3bb CMake: Also set CSYNC_BINARY_DIR
...so NSIS finds its resource in the right place.
2012-10-10 15:15:19 +02:00
Daniel Molkentin
aa63a789dc Fix for prev. commmit 2012-10-10 14:19:29 +02:00
Daniel Molkentin
d599c4532c replace relative csync buildir detection magic
If you do not want to run make install for lib(o)csync,
pass -DCSYNC_LIBRARY_PATH=$your_csync_builddir
and  -DCSYNC_INCLUDE_PATH=$your_csync_srcdir/src
to cmake when building mirall.
2012-10-10 14:04:24 +02:00
Klaas Freitag
7e1c58b602 Fix include path search. 2012-10-05 17:13:23 +02:00
Klaas Freitag
e0a21ebfd6 Fix to find the header even from installed ocsync packages. 2012-10-05 17:02:39 +02:00
Klaas Freitag
fabb353158 Use Qt proxy setting in csync in case its "default proxy" 2012-10-02 13:24:10 +02:00
Klaas Freitag
de60d53a78 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
2012-10-02 12:34:06 +02:00
Klaas Freitag
912f440176 Added win dir to most hackish solution ever. 2012-08-30 18:47:43 +03:00
Klaas Freitag
a2b5596ee1 removed wrong path piece "win" 2012-08-27 18:56:34 +03:00
Thomas Mueller
89b9e55945 second possible header name added 2012-06-19 00:13:58 +02:00
Thomas Mueller
963e76dea4 added HINTS to a path which can be specified via a environment setting 2012-06-18 23:21:12 +02:00
Dominik Schmidt
f7c34ea652 Try some stuff with FindCsync.cmake 2012-04-14 04:19:52 +02:00
Klaas Freitag
1b12e6590f Built a portable version of FindCSync that finds dev setup stuff. 2012-03-14 15:26:22 +01:00
Klaas Freitag
09fdcf2053 add a path hint for the locally built version of csync to findcsync. 2012-03-12 17:36:38 +01:00
Klaas Freitag
df2d745747 Add a hint to find the development time csync libs and includes. 2012-03-08 11:38:15 +01:00
Duncan Mac-Vicar P
3ce5932bbd g
Basic implementation of a CSyncFolder

Still waiting for Jann's patches for conflictcopy to hit a stable
release to make it the default.
2011-04-07 19:04:07 +02:00