summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'FindPackageModeMakefileTest-use-explicit-linkage'Brad King2018-08-302-0/+10
|\
| * FindPackageModeMakefileTest: Explicitly use C linkageChuck Atkins2018-08-292-0/+10
* | Merge topic 'libarchive-bump-minimum-version'Brad King2018-08-301-1/+1
|\ \
| * | libarchive: Bump the minimum version from 3.0.0 to 3.1.0Chuck Atkins2018-08-291-1/+1
| |/
* | Merge topic 'cmake_lang_compiler_predefines'Brad King2018-08-303-3/+21
|\ \
| * | Respect CMAKE_<LANG>_COMPILER_ARG1 in CMAKE_<LANG>_COMPILER_PREDEFINES_COMMANDSebastian Holtermann2018-08-283-3/+21
* | | Merge topic 'cstr-remove'Brad King2018-08-301-8/+8
|\ \ \
| * | | cmVisualStudio10TargetGenerator: clean up c_str()sVitaly Stakhovsky2018-08-281-8/+8
* | | | Merge topic 'genex-evaluate-stdstring'Brad King2018-08-305-23/+18
|\ \ \ \
| * | | | Genex: Return Evaluate results as const std::string&Vitaly Stakhovsky2018-08-285-23/+18
* | | | | Merge topic 'remove-lua-extra-paths'Brad King2018-08-301-9/+0
|\ \ \ \ \
| * | | | | FindLua: Remove manually specified additional pathsChuck Atkins2018-08-281-9/+0
* | | | | | Merge branch 'release-3.12'Brad King2018-08-300-0/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'android-ndk-r18' into release-3.12Brad King2018-08-285-9/+29
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'android-ndk-r18'Brad King2018-08-305-9/+29
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Android: Add support for NDK r18Brad King2018-08-285-9/+29
* | | | | | | | CMake Nightly Date StampKitware Robot2018-08-301-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-08-291-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'FindMatlab-missing-install'Brad King2018-08-281-12/+14
|\ \ \ \ \ \
| * | | | | | FindMatlab: Guard against nonexistent installationChuck Atkins2018-08-271-12/+14
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'lg-directory'Brad King2018-08-2811-22/+21
|\ \ \ \ \ \
| * | | | | | cmLocalGenerator: return directories as const std::string&Vitaly Stakhovsky2018-08-2711-22/+21
* | | | | | | Merge topic 'mk-directory'Brad King2018-08-2821-67/+65
|\ \ \ \ \ \ \
| * | | | | | | cmMakefile: return directories as const std::string&Vitaly Stakhovsky2018-08-2721-67/+65
* | | | | | | | CMake Nightly Date StampKitware Robot2018-08-281-1/+1
| |_|/ / / / / |/| | | | | |
* | | | | | | Merge topic 'cray_cce_cxx14'Brad King2018-08-271-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Cray: Record C++14 compiler mode optionsKelly (KT) Thompson2018-08-241-0/+4
* | | | | | | | Merge topic 'more-misc-typos'Brad King2018-08-274-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Maint: misc. typosluz.paz2018-08-244-4/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge topic 'update-icons'Brad King2018-08-278-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | cmake-gui: Update iconsT.J. Corona2018-08-168-0/+0
* | | | | | | | | Merge topic 'static-lib-options'Brad King2018-08-2725-15/+187
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | static library: add property STATIC_LIBRARY_OPTIONSMarc Chevrier2018-08-1525-15/+187
* | | | | | | | | | Merge topic 'FindZLIB-ProgramFiles'Brad King2018-08-271-3/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | FindZLIB: Fix path detection via ProgramFiles env variablesAndreas Schneider2018-08-241-3/+5
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'doc-include_directories-alternative'Brad King2018-08-271-0/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Help: Document alternative to include_directoriesDavid Demelier2018-08-231-0/+6
| | |_|_|_|/ / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'ProjectReference'Brad King2018-08-271-23/+21
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | VS: Disallow ReferenceOutputAssembly in ProjectReference if not possibleBastien Schatt2018-08-121-23/+21
* | | | | | | | | | | Merge topic 'ninja-generator-do-not-add-alias-matching-custom-command-output'Brad King2018-08-273-0/+54
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ninja: Fix dupbuild error skipping alias with conflicting custom commandJean-Christophe Fillion-Robin2018-08-093-0/+54
* | | | | | | | | | | | Merge topic 'xcode-compiler-id-sign-identity'Brad King2018-08-272-0/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Xcode: Set CODE_SIGN_IDENTITY during compiler identificationRafal Parzych2018-08-242-0/+7
* | | | | | | | | | | | | Merge topic 'extra-gen-fix-0'Brad King2018-08-271-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Extra Generator: Fix extraction of macros with value 0ibisz2018-08-241-3/+3
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'vs2017-no-default-FC'Brad King2018-08-271-0/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
| * | | | | | | | | | | | VS: Avoid VS 2017 toolset default use of /FC flagBrad King2018-08-231-0/+10
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-271-1/+1
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-261-1/+1
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2018-08-251-1/+1
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |