summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge topic 'fileApiAddPrecompileHeadersBacktrace'Brad King2020-05-2514-8/+712
|\
| * fileapi: Extend codemodel targets with PRECOMPILE_HEADERSJustin Goshi2020-05-229-3/+218
| * Tests: Add a PCH example to RunCMake.FileAPI codemodel-v2Justin Goshi2020-05-228-2/+491
| * Tests: Fix indentation in RunCMake.FileAPI cxx_exe.jsonBrad King2020-05-221-2/+2
| * PCH: Fix source group of per-architecture PCH headersBrad King2020-05-221-1/+1
* | Merge topic 'FindSquish_settingsgroup_removal'Brad King2020-05-254-16/+10
|\ \
| * | FindSquish: Remove settingsGroup argumentFrederik Gladhorn2020-05-194-16/+10
* | | Merge topic 'curl-send-recv'Brad King2020-05-251-0/+17
|\ \ \
| * | | curl: Avoid checking 'send' and 'recv' signaturesBrad King2020-05-201-0/+17
* | | | Merge topic 'cuda-runtime-cleanup'Brad King2020-05-258-89/+72
|\ \ \ \
| * | | | CUDA: Simplify Clang implicit host linker settingsBrad King2020-05-221-14/+6
| * | | | CUDA: Fix implicit runtime library filtering on WindowsBrad King2020-05-221-3/+3
| * | | | CUDA: Refactor implicit library filteringBrad King2020-05-222-15/+21
| * | | | CUDA: Move VS CudaRuntime selection to be with rest of CUDA optionsBrad King2020-05-223-26/+11
| * | | | CUDA: Factor runtime library lookup into helper methodBrad King2020-05-224-42/+42
* | | | | Merge branch 'release-3.17'Brad King2020-05-250-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'ninja-multi-install' into release-3.17Brad King2020-05-256-6/+117
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'ninja-multi-install'Brad King2020-05-256-6/+117
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Ninja Multi-Config: Make "install" targets depend on default configsKyle Edwards2020-05-226-6/+117
* | | | | | | CMake Nightly Date StampKitware Robot2020-05-251-1/+1
* | | | | | | Merge topic 'doc-init-and-env-var-priority'Craig Scott2020-05-248-1/+19
|\ \ \ \ \ \ \
| * | | | | | | Help: Clarify how env vars and ..._INIT variables interactCraig Scott2020-05-248-1/+19
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-241-1/+1
* | | | | | | | Merge topic 'doc-contributing-forum'Craig Scott2020-05-231-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Help: Update contributor instructions to refer to the forumCraig Scott2020-05-231-2/+2
|/ / / / / / / /
* | | | | | | | CMake Nightly Date StampKitware Robot2020-05-231-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'fortran-preprocess-property'Brad King2020-05-2238-131/+479
|\ \ \ \ \ \ \
| * | | | | | | Ninja: Skip Fortran preprocessing if Fortran_PREPROCESS is OFFPeter Hill2020-05-215-34/+88
| * | | | | | | Ninja: Add helper functions to generate Fortran buildPeter Hill2020-05-211-61/+87
| * | | | | | | Ninja: Add helper functions to generate Fortran preprocess rulePeter Hill2020-05-211-69/+98
| * | | | | | | Fortran: Add Fortran_PREPROCESS propertyPeter Hill2020-05-2137-4/+243
* | | | | | | | Merge topic 'cmake_language-rename-from-cmake_command'Craig Scott2020-05-2292-128/+127
|\ \ \ \ \ \ \ \
| * | | | | | | | cmake_language: Rename command from cmake_commandBrad King2020-05-2192-128/+127
* | | | | | | | | Merge topic 'autogen-fix-workerpool-locking'Brad King2020-05-221-28/+41
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Autogen: Redo locking and state machine for fence handling and the worker poolJoerg Sonnenberger2020-05-211-28/+41
* | | | | | | | | | Merge topic 'support_conda_env'Brad King2020-05-225-1/+26
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Conda: Add CONDA_PREFIX as an acceptable system prefix pathRobert Maynard2020-05-212-0/+7
| * | | | | | | | | Tests: Update QtAutogen codeeditor test only include headers neededRobert Maynard2020-05-211-1/+4
| * | | | | | | | | Tests: Update test suite to run in an Anaconda environmentRobert Maynard2020-05-212-0/+15
* | | | | | | | | | Merge branch 'release-3.17'Brad King2020-05-220-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge topic 'cuda-default-runtime' into release-3.17Brad King2020-05-2212-7/+65
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'cuda-default-runtime'Brad King2020-05-2212-7/+66
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'backport-cuda-default-runtime' into cuda-default-runtimeBrad King2020-05-2212-7/+66
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | CUDA: Compute CMAKE_CUDA_RUNTIME_LIBRARY default from toolchainRobert Maynard2020-05-2110-6/+60
| | * | | | | | | | | CUDA: Propagate CMAKE_CUDA_RUNTIME_LIBRARY state to try_compileRobert Maynard2020-05-202-0/+4
| | * | | | | | | | | Help: Correct CMAKE_CUDA_RUNTIME_LIBRARY applicabilityRobert Maynard2020-05-201-1/+1
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2020-05-221-1/+1
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'multi-ninja-pch-msvc'Brad King2020-05-216-12/+35
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Multi-Ninja: Fix PCHs for Visual C++Cristian Adam2020-05-206-12/+35
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge topic 'cmake_command_invoke_expand_function_name'Brad King2020-05-2122-21/+108
|\ \ \ \ \ \ \ \ \