summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindRuby-restore-include-path'Brad King2020-08-101-2/+1
|\ | | | | | | | | | | | | 6959744131 FindRuby: Restore compatibility variable RUBY_INCLUDE_PATH Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5109
| * FindRuby: Restore compatibility variable RUBY_INCLUDE_PATHBrad King2020-08-071-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since commit e672db628b (FindRuby: Rename variables to match case of module name, 2020-03-11, v3.18.0-rc1~546^2), the result variables named with the old `RUBY_` prefix are provided by compatibility code that maps from the new `Ruby_` prefix variables. There is no `Ruby_INCLUDE_PATH` variable, so do not try to map it to `RUBY_INCLUDE_PATH`. The latter is provided by dedicated compatibility code left from before that transition. Fixes: #21064
* | Merge branch 'release-3.18'Brad King2020-08-100-0/+0
|\ \
| * \ Merge topic 'FindPython-user-policies' into release-3.18Brad King2020-08-102-9/+6
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a92d384548 FindPython: ensure user's policies are respected Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !5098
* | \ \ Merge topic 'FindPython-user-policies'Brad King2020-08-102-9/+6
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | a92d384548 FindPython: ensure user's policies are respected Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Henry Schreiner <henryschreineriii@gmail.com> Merge-request: !5098
| * | | FindPython: ensure user's policies are respectedMarc Chevrier2020-08-072-9/+6
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not set the policy version before recording our internal macros such as `__Python_add_library`. Otherwise callers get our policy version instead of theirs. Instead just set the specific policies we need. Also fix one case in our test suite where we were accidentally relying on the policy version to be set by `FindPython`. Fixes: #21042
* | | Merge branch 'release-3.17'Brad King2020-08-100-0/+0
|\ \ \
| * \ \ Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.17Brad King2020-08-071-0/+5
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !5108
* | \ \ \ Merge branch 'release-3.16'Brad King2020-08-100-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'backport-test-FindPkgConfig-isolate-env' into release-3.16Brad King2020-08-071-0/+5
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | Merge-request: !5108
* | | | | | Merge branch 'release-3.18'Brad King2020-08-100-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge topic 'test-FindPkgConfig-isolate-env' into release-3.18Brad King2020-08-101-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b12982653 Merge branch 'backport-test-FindPkgConfig-isolate-env' 4c939b0d39 Tests: Isolate RunCMake.FindPkgConfig from caller environment 20eeb40aaf Tests: Isolate RunCMake.FindPkgConfig from caller environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5108
* | \ \ \ \ \ Merge topic 'test-FindPkgConfig-isolate-env'Brad King2020-08-101-0/+5
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8b12982653 Merge branch 'backport-test-FindPkgConfig-isolate-env' 4c939b0d39 Tests: Isolate RunCMake.FindPkgConfig from caller environment 20eeb40aaf Tests: Isolate RunCMake.FindPkgConfig from caller environment Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5108
| * | | | | | Merge branch 'backport-test-FindPkgConfig-isolate-env'Brad King2020-08-070-0/+0
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | |
| | * | | | | Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | Avoid interference from `CMAKE_PREFIX_PATH` and friends if they happen to be set in the environment from which the tests are run.
| * | | | | Tests: Isolate RunCMake.FindPkgConfig from caller environmentBrad King2020-08-071-0/+5
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | Avoid interference from `CMAKE_PREFIX_PATH` and friends if they happen to be set in the environment from which the tests are run.
* | | | | CMake Nightly Date StampKitware Robot2020-08-101-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-08-091-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2020-08-081-1/+1
| | | | |
* | | | | Merge topic 'cygwin-patches'Brad King2020-08-074-21/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ecc1961768 FindTclsh: Drop Cygwin-specific behavior and use POSIX code path af666acdf4 FindOpenGL: Drop Cygwin-specific behavior and use POSIX code path 8edbc59e46 install: Use case-sensitive pattern matching on Cygwin 24482499ea FindPerlLibs: Add versioned perl library name for Cygwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5092
| * | | | | FindTclsh: Drop Cygwin-specific behavior and use POSIX code pathLemures Lemniscati2020-08-061-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/3.17.3-findtclsh.patch
| * | | | | FindOpenGL: Drop Cygwin-specific behavior and use POSIX code pathLemures Lemniscati2020-08-061-13/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/3.17.3-opengl.patch
| * | | | | install: Use case-sensitive pattern matching on CygwinLemures Lemniscati2020-08-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/3.17.3-case-sensitivity.patch
| * | | | | FindPerlLibs: Add versioned perl library name for CygwinLemures Lemniscati2020-08-061-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on downstream patch from Cygwin package for CMake by Marco Atzeri: * https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/perl-libs.patch
* | | | | | Merge topic 'CUDAToolkit-no-nvcc'Brad King2020-08-072-54/+104
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cc815a2a6 CUDAToolkit: Detect CUDA SDK that don't have nvcc Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: Raul Tambre <raul@tambre.ee> Reviewed-by: Raul Tambre <raul@tambre.ee> Merge-request: !5061
| * | | | | | CUDAToolkit: Detect CUDA SDK that don't have nvccRobert Maynard2020-07-302-54/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a CUDA sdk doesn't have nvcc, defer to the existence of a version.txt file. When we do this fall back we also reconstruct the CUDA version via version.txt Fixes #20643
* | | | | | | Merge topic 'cuda_memcheck_more_errors'Brad King2020-08-074-2/+21
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d7a2cf681b Tests: Add cases for cuda-memcheck error types 562dcec3c4 CTest: Add error types to cuda-memcheck parser Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5101
| * | | | | | | Tests: Add cases for cuda-memcheck error typesTobias Ribizel2020-08-053-1/+19
| | | | | | | |
| * | | | | | | CTest: Add error types to cuda-memcheck parserTobias Ribizel2020-08-051-1/+2
| | | | | | | |
* | | | | | | | Merge topic 'cmFileCommand-typo'Brad King2020-08-071-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5dd710286f Correct a typo in cmFileCommand.cxx Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5106
| * | | | | | | | Correct a typo in cmFileCommand.cxxFelix Yan2020-08-061-1/+1
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2020-08-071-1/+1
| | | | | | | | |
* | | | | | | | | Merge topic 'compiler_flags'Brad King2020-08-0635-39/+235
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f76c20da63 Toolchain: Test compiler initial settings db486da265 Toolchain: Update documentation for initial compiler flags deec2f587c Toolchain: Take CMAKE_<lang>_FLAGS_INIT into account during compiler detection ca899af3e2 Toolchain: Handle repeated invocations of CMake with -DCMAKE_C_COMPILER 12ba89e142 Toolchain: Make `/path/comp;-argn' behave the same as 'comp;-argn' 6f1af899db Toolchain: Capture all arguments from CMAKE_<LANG>_COMPILER ec1d3bc0b6 cmake: avoid exception when printing "changed variables" message Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4136
| * | | | | | | | Toolchain: Test compiler initial settingsFred Baksik2020-08-0310-0/+93
| | | | | | | | |
| * | | | | | | | Toolchain: Update documentation for initial compiler flagsFred Baksik2020-08-0310-1/+91
| | | | | | | | |
| * | | | | | | | Toolchain: Take CMAKE_<lang>_FLAGS_INIT into account during compiler detectionFred Baksik2020-07-291-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20040
| * | | | | | | | Toolchain: Handle repeated invocations of CMake with -DCMAKE_C_COMPILERFred Baksik2020-07-292-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Repeated invocations of `cmake ... -DCMAKE_C_COMPILER=gcc` should not trigger a "You have changed variables" message even though the cache value of CMAKE_C_COMPILER changes from '/path/to/gcc' to 'gcc'. Make repeated invocations of `cmake ... -DCMAKE_C_COMPILER=gcc;-pipe` not trigger the warning by comparing the compiler name portion of the list to the compiler being used.
| * | | | | | | | Toolchain: Make `/path/comp;-argn' behave the same as 'comp;-argn'Fred Baksik2020-07-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using `cmake ... -DCMAKE_C_COMPILER=gcc;-pipe` first invocation of CMake worked correctly. When using `cmake ... -DCMAKE_C_COMPILER=/path/to/gcc;-pipe` first invocation of CMake detected a change to CMAKE_C_COMPILER, printed "You have changed variables" message, and re-ran the initial compiler tests after configuration was complete and before generation of the project files. The difference was due to the cache being forced updated with the new value of CMAKE_C_COMPILER so that the comparison check passes.
| * | | | | | | | Toolchain: Capture all arguments from CMAKE_<LANG>_COMPILERFred Baksik2020-07-2311-34/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Capture CMAKE_<LANG>_COMPILER_ARG1 from CMAKE_<LANG>_COMPILER in the same fashion that it is from $ENV{<LANG>}. Since get_filename_component() returns a single string of all the arguments from $ENV{<LANG>}, a single string of arguments will be constructed from the items contained in CMAKE_<LANG>_COMPILER. Fixes #20089
| * | | | | | | | cmake: avoid exception when printing "changed variables" messageFred Baksik2020-07-231-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the changed cache variable was a list then this processing may attempt to access beyond the last item in the list. Instead skip printing the non-existing value and backup one to finish the loop.
* | | | | | | | | Merge topic 'UseSWIG-support-files-in-subdirectories'Brad King2020-08-067-2/+86
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 50e53eaed9 UseSWIG: Take care of support files in sub-directories Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5097
| * | | | | | | | | UseSWIG: Take care of support files in sub-directoriesMarc Chevrier2020-08-047-2/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20833
* | | | | | | | | | Merge topic 'update-kwsys'Brad King2020-08-065-62/+26
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05e3abafa5 Merge branch 'upstream-KWSys' into update-kwsys 82fd685043 KWSys 2020-08-05 (185dd56e) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5104
| * \ \ \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2020-08-055-62/+26
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By KWSys Upstream * upstream-KWSys: KWSys 2020-08-05 (185dd56e)
| | * | | | | | | | | KWSys 2020-08-05 (185dd56e)KWSys Upstream2020-08-055-62/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 185dd56e5256de9dc266ec34f28db7527899de28 (master). Upstream Shortlog ----------------- Lemures Lemniscati (3): be39cd88 Glob: Use case-sensitive globbing on Cygwin 63dbb0ca SystemInformation: Improve CPU info lookup on Cygwin 4ef36a00 SystemTools: Remove Cygwin-specific file lookup optimization Rolf Eike Beer (1): c55e5dc3 CTestConfig: allow nightly build submission using https
* | | | | | | | | | | Merge topic 'cmake-find-package-mode-help'Brad King2020-08-061-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c0e4a0bd82 cmake: Update --help output to discourage use of --find-package mode Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev> Merge-request: !5099
| * | | | | | | | | | | cmake: Update --help output to discourage use of --find-package modeBrad King2020-08-041-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #21056
* | | | | | | | | | | Merge topic 'improve_standard_required_doc'Brad King2020-08-063-3/+3
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2cc1159653 Help: Clarify what MSVC compilers ignore <LANG>_STANDARD_REQUIRED Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5093
| * | | | | | | | | | | Help: Clarify what MSVC compilers ignore <LANG>_STANDARD_REQUIREDRobert Maynard2020-08-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20953
* | | | | | | | | | | | Merge topic 'doc-imported-dll-implib'Brad King2020-08-061-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1f1feb72f8 Help: Document in add_library that IMPORTED_IMPLIB is for DLL import libs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5096