9 commits

Author	SHA1	Message	Date
Daniel Molkentin	269b59c2ba	More CMake adjustments	2014-11-09 22:58:24 +01:00
Daniel Molkentin	9ebc41ed6f	Remove "Mirall" from cmake project files	2014-11-09 22:30:05 +01:00
Christian Kamm	7ae0338f5c	Merge remote-tracking branch 'origin/1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/socketapi.h src/libsync/syncengine.h test/CMakeLists.txt	2014-10-22 10:41:55 +02:00
Tim Vandecasteele	f3cc614427	Fix apple build. ... The apple build was broken because the elseif in the CMakeLists is never triggered. Some code was not properly adapted for the new qtmacgoodies. Some paths were not adapted to new split.	2014-09-12 14:24:26 +02:00
Klaas Freitag	bcff1ced5e	Merge branch '1.7' ... Conflicts: src/CMakeLists.txt src/cmd/cmd.cpp src/gui/folderman.cpp src/gui/wizard/owncloudadvancedsetuppage.cpp src/libsync/account.cpp	2014-08-29 20:40:33 +02:00
Daniel Molkentin	e5471d8318	Build after merge	2014-08-26 14:33:21 +02:00
Daniel Molkentin	5041880854	Try to handle BUILD_LIBRARIES_ONLY correctly ... Also, try to fix OS X build	2014-07-11 12:36:01 +02:00
Daniel Molkentin	2c904afd04	OS X explicitly requires the neon include path to be set	2014-07-11 12:11:04 +02:00
Daniel Molkentin	df3c3bca02	Split into three separate projects: library, gui and cmd	2014-07-11 11:07:31 +02:00