summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge branch 'ninja_cuda_export_compile_commands_support' into release-3.9Brad King2017-07-132-7/+24
|\ \ \ \
| * | | | CUDA: CMAKE_EXPORT_COMPILE_COMMANDS now works with CUDA and NinjaRobert Maynard2017-07-132-7/+24
| |/ / /
* | | | Merge branch 'android-system-include-last' into release-3.9Brad King2017-07-137-13/+45
|\ \ \ \ | |/ / / |/| | |
| * | | Android: Always add standard include directories lastBrad King2017-07-137-13/+45
|/ / /
* | | CMake 3.9.0-rc6v3.9.0-rc6Brad King2017-07-121-1/+1
* | | Merge branch 'android-fix-c++_shared' into release-3.9Brad King2017-07-121-0/+1
|\ \ \
| * | | Android: Link to android_support with c++_sharedBrad King2017-07-121-0/+1
* | | | Merge branch 'vs-2017-sln-guid' into release-3.9Brad King2017-07-1113-12/+37
|\ \ \ \
| * | | | VS: Add SolutionGuid to generated .sln filesBrad King2017-07-1113-12/+37
| |/ / /
* | | | Merge branch 'find_package-root-prefix-path-suffixes' into release-3.9Brad King2017-07-1111-18/+75
|\ \ \ \
| * | | | find_*: Honor PATH_SUFFIXES in PackageName_ROOT pathsBrad King2017-07-119-0/+74
| * | | | cmFindCommon: Drop unused FilterPaths methodBrad King2017-07-112-17/+0
| * | | | cmFindCommon: Fix typo in PackageName_ROOT path labelBrad King2017-07-111-1/+1
| |/ / /
* | | | Merge branch 'bindexplib-revert-consts' into release-3.9Brad King2017-07-103-22/+12
|\ \ \ \
| * | | | bindexplib: Revert support for constants symbolsBrad King2017-07-103-22/+12
| |/ / /
* | | | Merge branch 'vs-2017-choose-via-environment' into release-3.9Brad King2017-07-102-0/+40
|\ \ \ \
| * | | | VS: Choose VS 2017 instance via environment variableBrad King2017-07-102-0/+40
| |/ / /
* | | | Merge branch 'autogen_skip_included' into release-3.9Brad King2017-07-101-28/+33
|\ \ \ \
| * | | | Autogen: Skip included files on demandSebastian Holtermann2017-07-101-28/+33
* | | | | Merge branch 'autogen-no-generated-files' into release-3.9Brad King2017-07-073-0/+10
|\ \ \ \ \
| * | | | | Autogen: Skip generated files for compatibility with CMake 3.8Brad King2017-07-073-0/+10
| | |/ / / | |/| | |
* | | | | Merge branch 'find_package-restore-considered-configs' into release-3.9Brad King2017-07-0712-2/+47
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | find_package: Restore longer message when config files were consideredBrad King2017-07-0712-2/+47
| |/ / /
* | | | Merge branch 'FindDoxygen-create-output-dir' into release-3.9Brad King2017-07-061-3/+11
|\ \ \ \
| * | | | FindDoxygen: Create DOXYGEN_OUTPUT_DIRECTORY if it doesn't existRobert Dailey2017-07-061-3/+11
|/ / / /
* | | | Merge branch 'autogen_p' into release-3.9Brad King2017-07-051-1/+0
|\ \ \ \
| * | | | Autogen: Continue search for FOO_p.h when FOO.h was foundSebastian Holtermann2017-07-021-1/+0
* | | | | Merge branch 'autogen-header-skip' into release-3.9Brad King2017-07-051-1/+1
|\ \ \ \ \
| * | | | | Autogen: Check .moc header name against SKIP listSebastian Holtermann2017-06-301-1/+1
| | |/ / / | |/| | |
* | | | | Merge branch 'vs-link-guard-cf' into release-3.9Brad King2017-06-302-6/+0
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | VS: Fix support for '/guard:cf' linker flagOlender, Sebastian D2017-06-302-6/+0
* | | | | Merge branch 'FindDoxygen-project-in-subdir' into release-3.9Brad King2017-06-301-5/+5
|\ \ \ \ \
| * | | | | FindDoxygen: Use a stable reference to the location of global resourcesRobert Dailey2017-06-291-5/+5
| |/ / / /
* | | | | Merge branch 'xcode-cross-sdk-object-libraries' into release-3.9Brad King2017-06-302-5/+5
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Xcode: Use correct Object Library paths for cross-SDK buildsGregor Jasny2017-06-292-5/+5
| |/ / /
* | | | Merge branch 'vs-link-debug-flags' into release-3.9Brad King2017-06-288-35/+340
|\ \ \ \
| * | | | VS: Add v140 and v141 flag table entries for /DEBUG:NONE and /DEBUG:FULLIan Hojnicki2017-06-282-0/+11
| * | | | VS: Fix GenerateDebugInformation values for v140 and v141 toolsetsBrad King2017-06-285-30/+39
| * | | | VS: Fix GenerateDebugInformation flag map text for v141 toolsetsIan Hojnicki2017-06-281-2/+2
| * | | | VS: Split link flag table between v140 and v141 toolsetsIan Hojnicki2017-06-285-6/+291
| |/ / /
* | | | Merge branch 'curl-haiku' into release-3.9Brad King2017-06-281-0/+2
|\ \ \ \ | |/ / / |/| | |
| * | | curl: Fix build on HaikuJérôme Duval2017-06-281-0/+2
* | | | CMake 3.9.0-rc5v3.9.0-rc5Brad King2017-06-271-1/+1
* | | | Merge branch 'FindDoxygen-internal-var' into release-3.9Brad King2017-06-271-6/+6
|\ \ \ \
| * | | | FindDoxygen: Add private prefix to internal variablesBrad King2017-06-271-6/+6
* | | | | Merge branch 'fix-crash-on-non-enabled-language-features' into release-3.9Brad King2017-06-2727-14/+49
|\ \ \ \ \
| * | | | | target_compile_features: Do not crash on non-enabled languageBrad King2017-06-265-2/+27
| * | | | | Tests: Enable languages explicitly in RunCMake.target_compile_featuresBrad King2017-06-2622-12/+22
| | |/ / / | |/| | |
* | | | | Merge branch 'vs-cuda-fix-flags' into release-3.9Brad King2017-06-272-3/+8
|\ \ \ \ \
| * | | | | VS: Fix support for nvcc flags not in our flag tableBrad King2017-06-272-3/+8