summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* OpenWatcom: Add workaround for lack of error on missing libraryBrad King2018-04-181-0/+7
* Merge branch 'release-3.11'Brad King2018-04-170-0/+0
|\
| * CMake 3.11.1v3.11.1Brad King2018-04-171-1/+1
* | Merge branch 'release-3.11'Brad King2018-04-170-0/+0
|\ \ | |/
| * Merge branch 'bootstrap_system_libuv_option' into release-3.11Brad King2018-04-171-2/+4
| |\
* | \ Merge topic 'bootstrap_system_libuv_option'Brad King2018-04-171-2/+4
|\ \ \ | | |/ | |/|
| * | bootstrap: Add option to enable/disable usage of system libuvKirill Erofeev2018-04-171-2/+4
* | | Merge topic 'list-TRANSFORM'Brad King2018-04-17106-109/+1426
|\ \ \
| * | | list: Add TRANSFORM sub-commandMarc Chevrier2018-04-16100-0/+1224
| * | | string() Refactoring: creates an helper for REGEX REPLACEMarc Chevrier2018-04-166-109/+202
* | | | Merge topic 'FindOpenAL-std-includes'Brad King2018-04-171-1/+1
|\ \ \ \
| * | | | FindOpenAL: Find AL/al.h or OpenAL/al.h in standard include pathsJames Jones2018-04-161-1/+1
* | | | | Merge topic 'vs-conditional-reference-assembly'Brad King2018-04-171-4/+2
|\ \ \ \ \
| * | | | | VS: Disallow ReferenceOutputAssembly in ProjectReference if not possibleBastien Schatt2018-04-131-4/+2
* | | | | | Merge branch 'release-3.11'Brad King2018-04-170-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge branch 'FindOpenMP-Intel-Windows' into release-3.11Brad King2018-04-161-13/+4
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'implicit-lib-gcceh-file' into release-3.11Brad King2018-04-162-1/+7
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'libuv_version_bump' into release-3.11Brad King2018-04-161-1/+1
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'FindOpenMP-Intel-Windows'Brad King2018-04-171-13/+4
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | FindOpenMP: Fix support for Intel on WindowsRoland Schulz2018-04-161-13/+4
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge topic 'implicit-lib-gcceh-file'Brad King2018-04-172-1/+7
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | |
| * | | | | | | Exclude "libgcc_eh" library files from implicit link librariesBrad King2018-04-162-1/+7
| |/ / / / / /
* | | | | | | Merge topic 'libuv_version_bump'Brad King2018-04-171-1/+1
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Explicitly require LibUV 1.10 or higher to build CMakeErofeevK2018-04-161-1/+1
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2018-04-171-1/+1
* | | | | | Merge topic 'cuda-compiler-loaded'Brad King2018-04-161-0/+1
|\ \ \ \ \ \
| * | | | | | CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabledHenry Schreiner2018-04-131-0/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge topic 'vs-cuda-pdb'Brad King2018-04-165-0/+51
|\ \ \ \ \ \
| * | | | | | VS: Add workaround for CUDA compiler PDB locationBrad King2018-04-135-0/+51
* | | | | | | Merge topic 'test-ExternalData-dedup'Brad King2018-04-162-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Tests: Avoid duplicate rules in ExternalData testBrad King2018-04-132-3/+4
* | | | | | | | Merge branch 'release-3.11'Brad King2018-04-160-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| * | | | | | | Merge branch 'backport-fix-explicit-CMakeLists.txt' into release-3.11Brad King2018-04-1310-9/+91
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'fix-explicit-CMakeLists.txt'Brad King2018-04-1610-9/+91
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Merge branch 'backport-fix-explicit-CMakeLists.txt'Brad King2018-04-1310-9/+91
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| / / / / / | | |_|/ / / / / | |/| | | | | |
| | * | | | | | Restore support for explicitly referenced CMakeLists.txt sourcesBrad King2018-04-1310-9/+91
| | | |_|_|/ / | | |/| | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-161-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2018-04-151-1/+1
* | | | | | CMake Nightly Date StampKitware Robot2018-04-141-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'clang-cl-std'Brad King2018-04-131-5/+42
|\ \ \ \ \
| * | | | | Clang: Add standard flags support when simulating MSVCRuben Van Boxem2018-04-111-0/+21
| * | | | | Clang: Avoid extra C++ feature detection when simulating MSVCBrad King2018-04-111-0/+15
| * | | | | Clang: Refactor standard flags logic when simulating MSVCBrad King2018-04-111-5/+6
* | | | | | Merge topic 'update-kwsys'Brad King2018-04-131-2/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-04-121-2/+0
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | KWSys 2018-04-12 (9da3e5bc)KWSys Upstream2018-04-121-2/+0
* | | | | | CMake Nightly Date StampKitware Robot2018-04-131-1/+1
* | | | | | Merge topic 'doc-dev-mr-edit'Craig Scott2018-04-121-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | CONTRIBUTING: Mention GitLab option to allow edits from maintainersBrad King2018-04-121-0/+1
|/ / / / /
* | | | | Merge branch 'release-3.11'Brad King2018-04-120-0/+0
|\ \ \ \ \ | | |_|_|/ | |/| | |