summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* list(): add `JOIN` sub-commandMarc Chevrier2018-03-2016-0/+93
* Merge branch 'release-3.11'Brad King2018-03-190-0/+0
|\
| * Merge branch 'revert-findqt4-dirs-fix' into release-3.11Brad King2018-03-191-12/+1
| |\
* | \ Merge topic 'revert-findqt4-dirs-fix'Brad King2018-03-191-12/+1
|\ \ \ | | |/ | |/|
| * | FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"Brad King2018-03-191-12/+1
* | | Merge topic 'find-package_root-restore'Brad King2018-03-1926-61/+255
|\ \ \
| * | | find_package: Use PackageName_ROOT variables as search prefixesBrad King2018-03-1626-61/+255
* | | | Merge topic 'doc-list-command'Brad King2018-03-191-43/+126
|\ \ \ \
| * | | | Help: refresh list() command documentationMarc Chevrier2018-03-161-43/+126
* | | | | Merge topic 'export-properties'Brad King2018-03-1920-0/+160
|\ \ \ \ \
| * | | | | Export: allow exporting of additional propertiesWouter Klouwen2018-03-1620-0/+160
* | | | | | Merge topic 'codelite-project-settings'Brad King2018-03-191-4/+7
|\ \ \ \ \ \
| * | | | | | CodeLite: Prefer CMAKE_RUNTIME_OUTPUT_DIRECTORY for output pathTobias R. Henle2018-03-141-3/+6
| * | | | | | CodeLite: Use project Makefile instead of workspace Makefile.Tobias R. Henle2018-03-141-1/+1
* | | | | | | Merge topic 'vs-debugger-command'Brad King2018-03-197-0/+51
|\ \ \ \ \ \ \
| * | | | | | | VS: Add target property VS_DEBUGGER_COMMANDHannes Mezger2018-03-147-0/+51
* | | | | | | | Merge topic 'vs10-cmelem'Brad King2018-03-192-72/+83
|\ \ \ \ \ \ \ \
| * | | | | | | | cmVisualStudio10TargetGenerator: improved XML nestingVitaly Stakhovsky2018-03-162-72/+83
* | | | | | | | | Merge branch 'release-3.11'Brad King2018-03-190-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | Merge branch 'intel-initializer-list' into release-3.11Brad King2018-03-162-5/+7
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'intel-initializer-list'Brad King2018-03-192-5/+7
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| * | | | | | | | | Features: Record initializer list support for Intel 14 and aboveBrad King2018-03-162-5/+7
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-191-1/+1
* | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-181-1/+1
* | | | | | | | | Merge topic 'project-homepage-url'Craig Scott2018-03-1722-16/+180
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | project: Add HOMEPAGE_URL named parameterAlex Turbov2018-03-1619-11/+166
| * | | | | | | | | project: Add <PROJECT-NAME>_DESCRIPTIONCraig Scott2018-03-164-3/+12
| * | | | | | | | | Help: Fix minor typo in docs for CMAKE_PROJECT_DESCRIPTIONCraig Scott2018-03-161-1/+1
| * | | | | | | | | Tests: Avoid enabling languages unnecessarily in RunCMake.projectBrad King2018-03-151-1/+1
* | | | | | | | | | CMake Nightly Date StampKitware Robot2018-03-171-1/+1
* | | | | | | | | | 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
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |