mirrors/nextcloud-desktop
3
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2025-10-26 11:17:43 +00:00
Code Issues Packages Projects Releases Wiki Activity
8d14286bd3
nextcloud-desktop/cmake/Modules
History
Olivier Goffart b5ed352aa3 Merge remote-tracking branch 'origin/master' into ocsync 
Only confluct resolution, do not compile or works

Conflicts:
	CMakeLists.txt
	CPackConfig.cmake
	ConfigureChecks.cmake
	client/csync_client.c
	cmake/Modules/DefineCompilerFlags.cmake
	cmake/Modules/DefineInstallationPaths.cmake
	cmake/Modules/FindIconv.cmake
	cmake/Modules/FindIniparser.cmake
	cmake/Modules/FindNeon.cmake
	config.h.cmake
	config/CMakeLists.txt
	config/ocsync.conf
	doc/CMakeLists.txt
	modules/csync_owncloud.c
	modules/csync_sftp2.c
	src/CMakeLists.txt
	src/csync.c
	src/csync.h
	src/csync_config.c
	src/csync_exclude.c
	src/csync_lock.c
	src/csync_macros.h
	src/csync_misc.c
	src/csync_misc.h
	src/csync_private.h
	src/csync_propagate.c
	src/csync_statedb.c
	src/csync_statedb.h
	src/csync_update.c
	src/csync_util.c
	src/csync_util.h
	src/std/c_dir.c
	src/std/c_file.c
	src/std/c_private.h
	src/std/c_string.c
	src/std/c_string.h
	src/std/c_time.c
	src/vio/csync_vio.c
	src/vio/csync_vio.h
	src/vio/csync_vio_file_stat.h
	src/vio/csync_vio_local.c
	src/vio/csync_vio_method.h
	tests/CMakeLists.txt
	tests/csync_tests/check_csync_statedb_load.c
	tests/csync_tests/check_csync_statedb_query.c
	tests/csync_tests/check_csync_treewalk.c
	tests/csync_tests/check_csync_update.c
	tests/ownCloud/HTTP/DAV.pm
	tests/ownCloud/ownCloud/Test.pm
	tests/std_tests/check_std_c_str.c
	tests/vio_tests/check_vio.c
2013-08-18 16:21:18 +02:00
..
AddCMockaTest.cmake tests: Start to use cmocka for the tests. 2012-10-16 10:37:40 +02:00
CheckCCompilerFlagSSP.cmake cmake: Update compiler flags. 2013-03-14 10:10:41 +01:00
COPYING-CMAKE-SCRIPTS Initial commit 2008-02-27 18:56:47 +01:00
DefineCMakeDefaults.cmake Eliminate all warnings 2013-07-31 13:12:10 +02:00
DefineCompilerFlags.cmake Merge remote-tracking branch 'origin/master' into ocsync 2013-08-18 16:21:18 +02:00
DefineInstallationPaths.cmake cmake: Fix make install on win32 platform. 2013-07-23 07:41:41 +02:00
DefinePlatformDefaults.cmake cmake: Fix build on OSX. 2012-01-20 15:23:18 +01:00
FindCMocka.cmake tests: Start to use cmocka for the tests. 2012-10-16 10:37:40 +02:00
FindIconv.cmake cmake: Fix iconv detection on FreeBSD. 2013-07-14 15:51:09 +02:00
FindLibSSH.cmake LICENSE: Change license of libcsync from GPL to LGPL. 2013-07-29 14:04:37 +02:00
FindNeon.cmake Merge remote-tracking branch 'origin/master' into ocsync 2013-08-18 16:21:18 +02:00
FindOpenSSLCross.cmake use custom FindOpenSSL only for cross compilation in any other cases it is used from the local system 2012-07-30 13:27:59 +03:00
FindPackageVersionCheck.cmake LICENSE: Change license of libcsync from GPL to LGPL. 2013-07-29 14:04:37 +02:00
FindSMBClient.cmake cmake: Find SMBClient correctly. 2013-07-04 10:29:48 +02:00
FindSQLite3.cmake cmake: Require at least version 3.3.9 for sqlite3_prepare_v2(). 2013-07-13 09:17:40 +02:00
GNUInstallDirs.cmake Added GNUInstallDirs.cmake to lower the required cmake version. 2012-04-18 21:32:18 +02:00
MacroAddCompileFlags.cmake LICENSE: Change license of libcsync from GPL to LGPL. 2013-07-29 14:04:37 +02:00
MacroAddLinkFlags.cmake LICENSE: Change license of libcsync from GPL to LGPL. 2013-07-29 14:04:37 +02:00
MacroAddPlugin.cmake LICENSE: Change license of libcsync from GPL to LGPL. 2013-07-29 14:04:37 +02:00
MacroCopyFile.cmake LICENSE: Change license of libcsync from GPL to LGPL. 2013-07-29 14:04:37 +02:00
MacroEnsureOutOfSourceBuild.cmake Initial commit 2008-02-27 18:56:47 +01:00
UseAsciidoc.cmake LICENSE: Change license of libcsync from GPL to LGPL. 2013-07-29 14:04:37 +02:00
UseDoxygen.cmake Update doxygen generation. 2008-08-20 18:58:17 +02:00