mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-19 22:38:33 -05:00
Code Issues Packages Projects Releases Wiki Activity
49,401 Commits 2 Branches 401 Tags
01ff929debfb1ced677095b7e24f75cb37af75ce
Commit Graph

49401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 01ff929deb Merge branch 'release-3.18' 2020-08-10 10:45:54 -04:00
Brad King 000b761777 Merge topic 'test-FindPkgConfig-isolate-env' 
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
 2020-08-10 10:45:54 -04:00
Brad King 72409ee089 Merge topic 'test-FindPkgConfig-isolate-env' into release-3.18 
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
 2020-08-10 10:45:54 -04:00
Kitware Robot 514292ab0f CMake Nightly Date Stamp 2020-08-10 00:01:10 -04:00
Kitware Robot 5170263c3f CMake Nightly Date Stamp 2020-08-09 00:01:08 -04:00
Kitware Robot f51e930365 CMake Nightly Date Stamp 2020-08-08 00:01:10 -04:00
Brad King d8f7a05b37 Merge topic 'cygwin-patches' 
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
 2020-08-07 11:05:39 -04:00
Brad King 304f159af4 Merge topic 'CUDAToolkit-no-nvcc' 
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
 2020-08-07 11:04:54 -04:00
Brad King ac44121027 Merge topic 'cuda_memcheck_more_errors' 
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
 2020-08-07 11:04:08 -04:00
Brad King e80840da14 Merge topic 'cmFileCommand-typo' 
5dd710286f Correct a typo in cmFileCommand.cxx

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5106
 2020-08-07 11:03:15 -04:00
Brad King 8b12982653 Merge branch 'backport-test-FindPkgConfig-isolate-env' 2020-08-07 10:49:19 -04:00
Brad King 4c939b0d39 Tests: Isolate RunCMake.FindPkgConfig from caller environment 
Avoid interference from `CMAKE_PREFIX_PATH` and friends if they
happen to be set in the environment from which the tests are run.
 2020-08-07 10:47:25 -04:00
Brad King 20eeb40aaf Tests: Isolate RunCMake.FindPkgConfig from caller environment 
Avoid interference from `CMAKE_PREFIX_PATH` and friends if they
happen to be set in the environment from which the tests are run.
 2020-08-07 10:37:28 -04:00
Kitware Robot ac4e9e10db CMake Nightly Date Stamp 2020-08-07 00:01:37 -04:00
Lemures Lemniscati ecc1961768 FindTclsh: Drop Cygwin-specific behavior and use POSIX code path 
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
 2020-08-06 12:37:16 -04:00
Lemures Lemniscati af666acdf4 FindOpenGL: Drop Cygwin-specific behavior and use POSIX code path 
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
 2020-08-06 12:36:55 -04:00
Lemures Lemniscati 8edbc59e46 install: Use case-sensitive pattern matching on Cygwin 
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
 2020-08-06 12:36:38 -04:00
Lemures Lemniscati 24482499ea FindPerlLibs: Add versioned perl library name for Cygwin 
Based on downstream patch from Cygwin package for CMake by Marco Atzeri:

* https://github.com/matzeri/cygwin-pkg/blob/64864eb8f0d635ea44226e4b9a41a7ca59a1c7dd/cmake/perl-libs.patch
 2020-08-06 12:35:56 -04:00
Brad King 4daf76e10a Merge topic 'compiler_flags' 
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
 2020-08-06 11:00:12 -04:00
Brad King fdcb7483d1 Merge topic 'UseSWIG-support-files-in-subdirectories' 
50e53eaed9 UseSWIG: Take care of support files in sub-directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5097
 2020-08-06 10:53:36 -04:00
Brad King 5c56aaa284 Merge topic 'update-kwsys' 
05e3abafa5 Merge branch 'upstream-KWSys' into update-kwsys
82fd685043 KWSys 2020-08-05 (185dd56e)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5104
 2020-08-06 10:51:59 -04:00
Brad King c1297edab6 Merge topic 'cmake-find-package-mode-help' 
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
 2020-08-06 10:51:04 -04:00
Brad King a5466e42c8 Merge topic 'improve_standard_required_doc' 
2cc1159653 Help: Clarify what MSVC compilers ignore <LANG>_STANDARD_REQUIRED

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5093
 2020-08-06 10:49:29 -04:00
Brad King ba6aa54b8d Merge topic 'doc-imported-dll-implib' 
1f1feb72f8 Help: Document in add_library that IMPORTED_IMPLIB is for DLL import libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5096
 2020-08-06 10:47:49 -04:00
Brad King b1892fb98c Merge topic 'FixTooManyOpenFiles' 
57f250dcc0 Graphviz: Fix issue with too many open file streams on Windows platform

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5088
 2020-08-06 10:45:35 -04:00
Brad King 158c14b638 Merge branch 'release-3.18' 2020-08-06 10:39:47 -04:00
Brad King 89e5f95c2b Merge topic 'reuse_pch_no_delay' 
ef97fbe6c2 PCH: Avoid unnecessary 30s delay on MSBuild Generator with REUSE_FROM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5102
 2020-08-06 10:39:47 -04:00
Brad King 13e5df19fd Merge topic 'reuse_pch_no_delay' into release-3.18 
ef97fbe6c2 PCH: Avoid unnecessary 30s delay on MSBuild Generator with REUSE_FROM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5102
 2020-08-06 10:39:46 -04:00
Brad King 85f6eb18a5 Merge branch 'release-3.18' 2020-08-06 10:37:03 -04:00
Brad King 9c4130ed60 Merge topic 'support_list_google_test_executor' into release-3.18 
8829d2caba GoogleTest: Restore support for list arguments in TEST_EXECUTOR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5084
 2020-08-06 10:37:03 -04:00
Brad King ab2366609e Merge topic 'support_list_google_test_executor' 
8829d2caba GoogleTest: Restore support for list arguments in TEST_EXECUTOR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5084
 2020-08-06 10:37:03 -04:00
Brad King 9d6163fa1b Merge branch 'release-3.17' 2020-08-06 10:31:55 -04:00
Brad King ab4895d6b2 Merge topic 'automoc_timestamp_deps' into release-3.18 
9a9ed4b9d3 Merge branch 'backport-3.17-automoc_timestamp_deps'
7445c9a58a AutoGen: Add test to check for correct AutoMoc dependencies
a79056bb02 AutoGen: Fix over-specified direct dependencies of custom command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Aleix <aleixpol@kde.org>
Merge-request: !5085
 2020-08-06 10:31:23 -04:00
Brad King 262644fc9e Merge branch 'release-3.18' 2020-08-06 10:31:23 -04:00
Brad King 030aa9dc30 Merge topic 'automoc_timestamp_deps' 
9a9ed4b9d3 Merge branch 'backport-3.17-automoc_timestamp_deps'
7445c9a58a AutoGen: Add test to check for correct AutoMoc dependencies
a79056bb02 AutoGen: Fix over-specified direct dependencies of custom command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Aleix <aleixpol@kde.org>
Merge-request: !5085
 2020-08-06 10:31:23 -04:00
Brad King 716dacc36a Merge branch 'release-3.18' 2020-08-06 10:28:28 -04:00
Brad King ce4216dedd Merge topic 'ninja-multi-rsp-remove-path' into release-3.18 
cdb50af2f6 Ninja: Restore shorter path to response files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !5094
 2020-08-06 10:28:27 -04:00
Brad King 06427db62c Merge topic 'ninja-multi-rsp-remove-path' 
cdb50af2f6 Ninja: Restore shorter path to response files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: alcroito <alexandru.croitor@qt.io>
Merge-request: !5094
 2020-08-06 10:28:27 -04:00
Felix Yan 5dd710286f Correct a typo in cmFileCommand.cxx 2020-08-06 10:25:51 -04:00
Kitware Robot 9d03b623e7 CMake Nightly Date Stamp 2020-08-06 00:01:13 -04:00
Brad King 05e3abafa5 Merge branch 'upstream-KWSys' into update-kwsys 
# By KWSys Upstream
* upstream-KWSys:
  KWSys 2020-08-05 (185dd56e)
 2020-08-05 16:29:07 -04:00
KWSys Upstream 82fd685043 KWSys 2020-08-05 (185dd56e) 
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
 2020-08-05 16:29:07 -04:00
Cristian Adam ef97fbe6c2 PCH: Avoid unnecessary 30s delay on MSBuild Generator with REUSE_FROM 
Fix logic added by commit 1f791eb160 (Multi-Ninja: Fix reusable PCHs for
MSVC, 2020-05-24, v3.18.0-rc1~72^2) to avoid an unnecessary delay.

Fixes: #21054
 2020-08-05 15:52:05 -04:00
Brad King effc9a1032 Merge branch 'backport-3.17-automoc_timestamp_deps' into release-3.17 
Merge-request: !5085
 2020-08-05 15:44:14 -04:00
Brad King 9a9ed4b9d3 Merge branch 'backport-3.17-automoc_timestamp_deps' 2020-08-05 15:42:39 -04:00
Tobias Ribizel d7a2cf681b Tests: Add cases for cuda-memcheck error types 2020-08-05 11:28:00 +02:00
Tobias Ribizel 562dcec3c4 CTest: Add error types to cuda-memcheck parser 2020-08-05 10:51:44 +02:00
Kitware Robot b26c35620c CMake Nightly Date Stamp 2020-08-05 00:01:09 -04:00
Brad King c0e4a0bd82 cmake: Update --help output to discourage use of --find-package mode 
Fixes: #21056
 2020-08-04 12:02:54 -04:00
Marc Chevrier 50e53eaed9 UseSWIG: Take care of support files in sub-directories 
Fixes: #20833
 2020-08-04 16:19:10 +02:00