summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-3.10'Brad King2018-03-160-0/+0
|\
| * CMake 3.10.3v3.10.3Brad King2018-03-161-1/+1
* | Merge branch 'release-3.11'Brad King2018-03-160-0/+0
|\ \
| * \ Merge branch 'gtest_discover_tests_timeout' into release-3.11Brad King2018-03-1615-16/+145
| |\ \
* | \ \ Merge branch 'release-3.10'Brad King2018-03-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'gtest_discover_tests_timeout' into release-3.10Brad King2018-03-1515-16/+145
| |\ \ \ | | | |/ | | |/|
* | | | Merge topic 'gtest_discover_tests_timeout'Brad King2018-03-1615-16/+145
|\ \ \ \ | | |/ / | |/| |
| * | | GoogleTest: Rename TIMEOUT parameter to avoid clashCraig Scott2018-03-1515-16/+145
* | | | CMake Nightly Date StampKitware Robot2018-03-161-1/+1
* | | | Merge topic 'clarify-contributing-doc'Brad King2018-03-151-0/+2
|\ \ \ \
| * | | | CONTRIBUTING: Clarify choice of master or release branch as a baseJean-Christophe Fillion-Robin2018-03-151-0/+2
* | | | | Merge topic 'compile-options-shell'Brad King2018-03-157-5/+73
|\ \ \ \ \
| * | | | | target_compile_options: Add syntax to specify shell stringsBrad King2018-03-147-5/+73
* | | | | | Merge branch 'release-3.11'Brad King2018-03-150-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'xl-cc-default-std' into release-3.11Brad King2018-03-141-1/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'findjni-mips-r6-new-arch' into release-3.11Brad King2018-03-141-1/+4
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'xl-cc-default-std'Brad King2018-03-151-1/+2
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | XL: Fix C default level detection when invoked as 'cc'Brad King2018-03-141-1/+2
* | | | | | | | Merge topic 'bootstrap-clarify-error'Brad King2018-03-151-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | bootstrap: Clarify error when building with invalid CXXFLAGSBen Chaney2018-03-141-1/+3
* | | | | | | | | Merge topic 'findjni-mips-r6-new-arch'Brad King2018-03-151-1/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | FindJNI: add some new architecture names for mips release 6YunQiang Su2018-03-141-1/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2018-03-151-1/+1
* | | | | | | | Merge topic 'cmake_project_xxx_docs'Brad King2018-03-145-10/+74
|\ \ \ \ \ \ \ \
| * | | | | | | | Help: Fix incorrect CMAKE_PROJECT_xxx docsCraig Scott2018-03-135-10/+74
* | | | | | | | | Merge topic 'build_and_test_mode_docs'Brad King2018-03-141-10/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Help: Clarify ctest build-and-test mode optionsCraig Scott2018-03-131-10/+14
| |/ / / / / / / /
* | | | | | | | | Merge topic 'doc-vs-workdir-versions'Brad King2018-03-141-0/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Help: Document VS_DEBUGGER_WORKING_DIRECTORY supported VS versionsHannes Mezger2018-03-131-0/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-141-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge branch 'release-3.11'Brad King2018-03-130-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Merge branch 'genex-COMPILE_LANGUAGE-system-include' into release-3.11Brad King2018-03-139-25/+43
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'ccmake-stack-smashing' into release-3.11Brad King2018-03-131-1/+1
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge branch 'release-3.10'Brad King2018-03-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| * | | | | | | | | Merge branch 'ccmake-stack-smashing' into release-3.10Brad King2018-03-131-1/+1
| |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
* | | | | | | | | | Merge topic 'genex-COMPILE_LANGUAGE-system-include'Brad King2018-03-139-25/+43
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Genex: Fix COMPILE_LANGUAGE propagation through try_compileBrad King2018-03-124-17/+21
| * | | | | | | | | Genex: Fix COMPILE_LANGUAGE in SYSTEM include directoriesBrad King2018-03-126-15/+29
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge topic 'ccmake-stack-smashing'Brad King2018-03-131-1/+1
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | |
| * | | | | | | ccmake: fix status line buffer overflow on very wide terminalsTianhao Chai2018-03-131-1/+1
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-03-131-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge branch 'release-3.11'Brad King2018-03-120-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'ep-support-passing-var-ending-with-notfound' into release-3.11Brad King2018-03-125-6/+36
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'update-buildsystem-docs' into release-3.11Brad King2018-03-121-6/+5
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
* | | | | | | Merge topic 'update-buildsystem-docs'Brad King2018-03-121-6/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Help: Adapt cmake-buildsystem(7) to new IMPORTED targets featuresKai Wolf2018-03-121-6/+5
| |/ / / / /
* | | | | | Merge topic 'ep-support-passing-var-ending-with-notfound'Brad King2018-03-125-6/+36
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | ExternalProject: Fix cache generation when last args ends with "-NOTFOUND"Jean-Christophe Fillion-Robin2018-03-125-6/+36
| |/ / / /
* | | | | Merge topic 'genex-TARGET_EXISTS'Brad King2018-03-1214-0/+83
|\ \ \ \ \
| * | | | | genex: Add TARGET_EXISTS to check for target existenceAlex Turbov2018-03-0914-0/+83