summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'release-3.23'Brad King2022-05-180-0/+0
|\
| * Merge topic 'ccmake-fix-infinite-loop-search' into release-3.23Brad King2022-05-182-7/+8
| |\
* | \ Merge topic 'ccmake-fix-infinite-loop-search'Brad King2022-05-182-7/+8
|\ \ \ | | |/ | |/|
| * | ccmake: Fix infinite loop during invalid searchMartin Duffy2022-05-182-7/+8
* | | Merge branch 'release-3.23'Brad King2022-05-180-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'clang-imsvc' into release-3.23Brad King2022-05-181-1/+1
| |\ \
* | \ \ Merge topic 'clang-imsvc'Brad King2022-05-181-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'backport-3.23-clang-imsvc' into clang-imsvcBrad King2022-05-171-1/+1
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Clang: Use -imsvc flag without space to support Clang toolsBrad King2022-05-171-1/+1
| | |/ /
* | | | Merge topic 'FindGLUT-remove-undocumented-vars'Brad King2022-05-182-4/+5
|\ \ \ \
| * | | | FindGLUT: Remove undocumented variables GLUT_INCLUDE_PATH and GLUT_LIBRARYLetu Ren2022-05-172-4/+5
* | | | | Merge topic 'fetchcontent-subbuild-config-type-fix'Brad King2022-05-181-3/+3
|\ \ \ \ \
| * | | | | FetchContent: Use Debug rather than Release for sub-buildCraig Scott2022-05-171-3/+3
* | | | | | CMake Nightly Date StampKitware Robot2022-05-181-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'try_compile-project-platform-vars'Brad King2022-05-1716-2/+125
|\ \ \ \ \
| * | | | | try_compile: Add option to skip passing platform variablesBrad King2022-05-1610-3/+45
| * | | | | try_compile: Propagate platform variables in project-mode tooBrad King2022-05-1614-2/+83
* | | | | | Merge topic 'update-curl'Brad King2022-05-1727-159/+291
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'upstream-curl' into update-curlBrad King2022-05-1626-158/+290
| |\ \ \ \ \ \
| | * | | | | | curl 2022-05-11 (462196e6)Curl Upstream2022-05-1626-158/+290
| * | | | | | | curl: Update script to get curl 7.83.1Brad King2022-05-161-1/+1
* | | | | | | | Merge topic 'findzlib-static'Brad King2022-05-171-6/+16
|\ \ \ \ \ \ \ \
| * | | | | | | | FindZLIB: fix ZLIB_USE_STATIC_LIBS on WindowsPeter Würth2022-05-131-6/+16
* | | | | | | | | Merge topic 'install-all-components-fix'Brad King2022-05-176-10/+31
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | install: Don't ignore EXCLUDE_FROM_ALL when used with ALL_COMPONENTSNils Gladitz2022-05-166-10/+31
* | | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-170-0/+0
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'release-3.22' into release-3.23Brad King2022-05-170-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge branch 'release-3.22'Brad King2022-05-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'FortranCInterface-gcc12' into release-3.22Brad King2022-05-161-0/+3
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ Merge branch 'release-3.23'Brad King2022-05-170-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge topic 'FortranCInterface-gcc12' into release-3.23Brad King2022-05-171-0/+3
| |\ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| | | | | | | | / | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | |
* | | | | | | | | | | Merge topic 'FortranCInterface-gcc12'Brad King2022-05-171-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | FortranCInterface: Fix failure with gfortran 12 and ClangBrad King2022-05-161-0/+3
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'ci-intel-compiler'Brad King2022-05-171-0/+14
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | gitlab-ci: add jobs testing Intel 2022.1.0 compilers on LinuxBrad King2022-05-161-0/+14
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-171-1/+1
|/ / / / / / / /
* | | | | | | | Merge topic 'CMAKE_PROJECT_TOP_LEVEL_INCLUDES'Brad King2022-05-1623-32/+170
|\ \ \ \ \ \ \ \
| * | | | | | | | project(): Add new CMAKE_PROJECT_TOP_LEVEL_INCLUDES file injection pointCraig Scott2022-05-1322-31/+170
| * | | | | | | | CMakeDetermineSystem: Remove unreachable codeCraig Scott2022-05-081-1/+0
* | | | | | | | | Merge topic 'test-clang-15'Brad King2022-05-162-2/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Tests: Add missing return types to C function prototypesBrad King2022-05-132-2/+3
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'release-3.23'Brad King2022-05-160-0/+0
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | |
| * | | | | | | | Merge topic 'cuda-arch-off-vs' into release-3.23Brad King2022-05-161-4/+5
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'cuda-arch-off-vs'Brad King2022-05-161-4/+5
|\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | / | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | VS: Fix CUDA CodeGeneration field for CMAKE_CUDA_ARCHITECTURES=OFFBrad King2022-05-131-4/+5
* | | | | | | | | Merge topic 'fetchcontent-subbuild-config-type'Craig Scott2022-05-161-2/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | FetchContent: Hard-code a config for the sub-buildCraig Scott2022-05-131-2/+11
* | | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-161-1/+1
* | | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-151-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2022-05-141-1/+1
| |_|_|/ / / / / |/| | | | | | |