nextcloud-desktop/cmake/modules
Daniel Molkentin 4fc044d368 Merge branch 'master' into move_lib_to_sep_dir
Conflicts:
	cmake/modules/NSIS.template.in
	src/CMakeLists.txt
	src/creds/shibboleth/authenticationdialog.cpp
	src/creds/shibboleth/authenticationdialog.h
	src/gui/owncloudgui.cpp
	src/libsync/creds/shibboleth/authenticationdialog.cpp
	src/libsync/creds/shibboleth/authenticationdialog.h
	src/libsync/mirallaccessmanager.cpp
	src/mirall/authenticationdialog.cpp
	src/mirall/authenticationdialog.h
2014-08-12 21:08:44 +02:00
..
AddAppIconMacro.cmake Icon: Make png2ico / windres failure non-fatal 2014-02-10 14:36:32 +01:00
AddCMockaTest.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
CheckCCompilerFlagSSP.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
CheckPrototypeDefinition.c.in Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
CheckPrototypeDefinition.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
COPYING-CMAKE-SCRIPTS Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
Copyright.txt Add Copyright.txt for cmake modules 2014-04-07 01:27:59 +02:00
DefineCMakeDefaults.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
DefineCompilerFlags.cmake cmake compilation flags: don't define -Wdeclaration-after-statement 2014-06-24 11:02:58 +02:00
DefineInstallationPaths.cmake Fix installation paths 2014-04-04 15:52:41 +02:00
DefinePlatformDefaults.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
DeployQt5.cmake Deploy with Qt5 2014-03-13 00:52:01 +01:00
FindCMocka.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
FindIconv.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
FindINotify.cmake Add FindINotify cmake module. 2014-01-23 16:15:29 +01:00
FindLibSSH.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
FindNeon.cmake CMake: Find libraries also on Win host compile 2014-04-22 21:02:08 +02:00
FindOpenSSLCross.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
FindPackageVersionCheck.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
FindPdfLatex.cmake Add doc cmake targets (HTML, PDF, QtHelp, CHM, man) 2012-11-25 00:38:47 +01:00
FindQt5Keychain.cmake About correctly when Qt5Keychain isn't found 2014-04-07 17:41:33 +02:00
FindQtKeychain.cmake cmake: Remove debug 2014-03-12 18:20:45 +01:00
FindSMBClient.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
FindSparkle.cmake Find sparkle the first time around 2014-01-30 12:57:33 +01:00
FindSphinx.cmake Add doc cmake targets (HTML, PDF, QtHelp, CHM, man) 2012-11-25 00:38:47 +01:00
FindSQLite3.cmake CMake: Find libraries also on Win host compile 2014-04-22 21:02:08 +02:00
GetGitRevisionDescription.cmake Update About dialog 2012-12-20 20:35:21 +01:00
GetGitRevisionDescription.cmake.in Update About dialog 2012-12-20 20:35:21 +01:00
GNUInstallDirs.cmake Update to latest GNUInstallDirs cmake module 2014-04-23 13:04:16 +02:00
MacOSXBundleInfo.plist.in Sparkle: Get it working 2014-02-04 17:37:01 +01:00
MacroAddCompileFlags.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
MacroAddLinkFlags.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
MacroAddPlugin.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
MacroCopyFile.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
MacroEnsureOutOfSourceBuild.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
MacroLogFeature.cmake Initial changes to also build on Qt5, doesn't compile yet 2013-08-28 17:03:31 +02:00
MacroOptionalFindPackage.cmake Initial changes to also build on Qt5, doesn't compile yet 2013-08-28 17:03:31 +02:00
NSIS.InstallOptions.ini.in Add win32 packaging with nsi 2012-04-02 13:44:24 +02:00
NSIS.template.in Merge branch 'master' into move_lib_to_sep_dir 2014-08-12 21:08:44 +02:00
QtVersionAbstraction.cmake Define Q_DECL_OVERRIDE for Qt4 2014-07-09 23:31:56 +02:00
UseAsciidoc.cmake Move csync in order to merge it with mirall 2014-01-13 14:39:50 +01:00
UseDoxygen.cmake rename csync/doc to csync/csync_doc to satisfy cmake. 2014-01-20 16:19:30 +01:00
Warnings.cmake Use std=c++0x instead of c++11 2014-08-11 15:46:45 +02:00