mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-04 05:10:10 -05:00
Code Issues Packages Projects Releases Wiki Activity
39,324 Commits 2 Branches 401 Tags
ccd17a557cbf8ada18207a72eea78d2adcc9d752
Commit Graph

39324 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King ccd17a557c Merge topic 'cuda-compiler-loaded' 
595aa12811 CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1955
 2018-04-16 09:15:01 -04:00
Brad King 5099af044f Merge topic 'vs-cuda-pdb' 
134e795fa9 VS: Add workaround for CUDA compiler PDB location

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1960
 2018-04-16 09:14:05 -04:00
Brad King 5e4c5b53e1 Merge topic 'test-ExternalData-dedup' 
bb66cea6c5 Tests: Avoid duplicate rules in ExternalData test

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1958
 2018-04-16 09:12:34 -04:00
Brad King 77db645ab8 Merge branch 'release-3.11' 2018-04-16 09:11:27 -04:00
Brad King 64a5b55088 Merge topic 'fix-explicit-CMakeLists.txt' 
0a122393d7 Merge branch 'backport-fix-explicit-CMakeLists.txt'
8480c2afc0 Restore support for explicitly referenced CMakeLists.txt sources

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1959
 2018-04-16 09:09:45 -04:00
Kitware Robot 912c2a6c7f CMake Nightly Date Stamp 2018-04-16 00:01:04 -04:00
Kitware Robot d244a8ab5b CMake Nightly Date Stamp 2018-04-15 00:01:07 -04:00
Kitware Robot dfeeaa37ae CMake Nightly Date Stamp 2018-04-14 00:01:07 -04:00
Henry Schreiner 595aa12811 CUDA: Set CMAKE_CUDA_COMPILER_LOADED variable when language is enabled 
We already do this for C, CXX, Fortran, etc.
 2018-04-13 13:04:33 -04:00
Brad King 134e795fa9 VS: Add workaround for CUDA compiler PDB location 
The CUDA Toolkit Visual Studio Integration does not honor the
`ClCompile.ProgramDataBaseFileName` field when telling `nvcc` how to
invoke `cl`.  Work around this problem by passing `-Xcompiler=-Fd...`
ourselves through `AdditionalOptions`.

Fixes: #17647
 2018-04-13 12:56:36 -04:00
Brad King 77705a2c28 Merge topic 'clang-cl-std' 
3f82c5904d Clang: Add standard flags support when simulating MSVC
8381bc12ad Clang: Avoid extra C++ feature detection when simulating MSVC
6cddf7ba32 Clang: Refactor standard flags logic when simulating MSVC

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1906
 2018-04-13 10:22:26 -04:00
Brad King 48d7aa2868 Merge topic 'update-kwsys' 
5ebbf2807b Merge branch 'upstream-KWSys' into update-kwsys
e488f73873 KWSys 2018-04-12 (9da3e5bc)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1953
 2018-04-13 09:55:40 -04:00
Brad King d00306636b Merge branch 'backport-fix-explicit-CMakeLists.txt' into release-3.11 
Merge-request: !1959
 2018-04-13 09:49:51 -04:00
Brad King 0a122393d7 Merge branch 'backport-fix-explicit-CMakeLists.txt' 2018-04-13 09:46:54 -04:00
Brad King 8480c2afc0 Restore support for explicitly referenced CMakeLists.txt sources 
Since commit v3.11.0-rc1~467^2 (VS,Xcode: Add CMakeLists.txt sources
without mutating targets, 2017-10-18) we do not add `CMakeLists.txt` to
target sources but instead generate references to them directly.  This
broke projects that explicitly specify their `CMakeLists.txt` file as a
source file because the explicit entry is no longer consolidated with
the generated one.

Teach the relevant generators to avoid duplicating `CMakeLists.txt`
source references and add test cases.

Fixes: #17828
 2018-04-13 09:41:06 -04:00
Brad King bb66cea6c5 Tests: Avoid duplicate rules in ExternalData test 
In commit v3.7.0-rc1~158^2 (ExternalData: Tolerate files duplicated
across multiple targets, 2016-07-07) we added a test case for repeating
the same data file reference in three different targets in the same
directory in order to exercise its corresponding fix.  However, we
re-used the top-level `Data.dat` file which is already produced by
an unrelated test case.  `ninja` diagnoses the duplicate rule.

Update the test to use a dedicated data file name for the three-times
repeated case to avoid this conflict.  It still covers the original
purpose of the test.
 2018-04-13 08:06:48 -04:00
Kitware Robot 07604a767d CMake Nightly Date Stamp 2018-04-13 00:01:04 -04:00
Craig Scott bf5b56b1a9 Merge topic 'doc-dev-mr-edit' 
fc7e1de188 CONTRIBUTING: Mention GitLab option to allow edits from maintainers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1954
 2018-04-12 17:48:36 -04:00
Brad King fc7e1de188 CONTRIBUTING: Mention GitLab option to allow edits from maintainers 
Collaboration between contributors and developers is easier if a
developer can push an update to a contributor's MR source branch.
 2018-04-12 13:16:38 -04:00
Brad King 5ebbf2807b Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-04-12 (9da3e5bc)
 2018-04-12 13:05:38 -04:00
KWSys Upstream e488f73873 KWSys 2018-04-12 (9da3e5bc) 
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 9da3e5bc847fa4187f42f60700e343a9ed09a161 (master).

Upstream Shortlog
-----------------

Brad King (1):
      c7ef6c1b SystemInformation: Do not include unnecessary fenv.h
 2018-04-12 13:05:37 -04:00
Brad King 4984d8433e Merge branch 'release-3.11' 2018-04-12 11:47:23 -04:00
Brad King 498be66fd7 Merge topic 'add_support_for_clr_targets' 
312527de47 document COMMON_LANGUAGE_RUNTIME target properties
4b7a82b4ed cmVisualStudio10TargetGenerator: set /clr compiler flag from property
20e31fb4c9 cmExportFileGenerator: add target property for managed targets
411a22706a cmGeneratorTarget: add handling of managed assemblies to HasImportLibrary()
fb433ff283 cmGeneratorTarget: Make import library checks config-aware
4c1f33961f cmGeneratorTarget: add GetManagedType() and CheckManagedType() methods
6c517a9f8d cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1916
 2018-04-12 11:36:28 -04:00
Brad King 2cdefcbe62 Merge topic 'variable_watch-on-PARENT_SCOPE' 
65198cfd0f variable_watch: trigger on variables set via PARENT_SCOPE

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1948
 2018-04-12 11:32:37 -04:00
Brad King d59cd3b131 Merge topic 'features-msvc-2017' 
5f4272cc06 Features: Record for VS 2017 through 15.6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1903
 2018-04-12 11:31:42 -04:00
Brad King aa5bedc52b Merge topic 'attr-escape' 
ff18dce5ed cmVisualStudio10TargetGenerator: Properly escape attributes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1937
 2018-04-12 11:29:24 -04:00
Brad King b148d3ade0 Merge topic 'FindMatlab-handle-exception' 
ffb1f19191 FindMatlab: add unit tests
44c916b4c8 FindMatlab: always handle uncaught exception

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1946
 2018-04-12 11:28:31 -04:00
Brad King f2376a5622 Merge topic 'FindwxWidgets-local-var' 
9174786008 FindwxWidgets: Use more private name for local variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1951
 2018-04-12 11:27:36 -04:00
Brad King 580822fa67 Merge topic 'FindImageMagick-FixForMultipleInstalls' 
68d1fc89ed FindImageMagick: Find components in same locations as main package

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1917
 2018-04-12 11:26:43 -04:00
Kitware Robot 3551aede35 CMake Nightly Date Stamp 2018-04-12 00:01:03 -04:00
Matteo Settenvini 65198cfd0f variable_watch: trigger on variables set via PARENT_SCOPE 
Make sure that we also trigger variable watches when a variable
is set in the parent scope.

Fixes: #17827
 2018-04-11 15:02:07 -04:00
Ruben Van Boxem 3f82c5904d Clang: Add standard flags support when simulating MSVC 
When Clang 3.9 simulates MSVC 19.0 or higher it knows the `-std:` flags
that such versions of MSVC defines.

Fixes: #17866
 2018-04-11 14:50:22 -04:00
Brad King 8381bc12ad Clang: Avoid extra C++ feature detection when simulating MSVC 
Apply the optimization from commit v3.10.0-rc1~131^2 (MSVC: Avoid
unnecessary C++ feature detection steps, 2017-09-11) to the case of
Clang simulating a version of MSVC that does not define standards.

Issue: #17274
 2018-04-11 14:47:28 -04:00
Brad King 6cddf7ba32 Clang: Refactor standard flags logic when simulating MSVC 
Consolidate the compile options and standard defaults branches.
Add comments.
 2018-04-11 14:45:16 -04:00
Roman Wüger 68d1fc89ed FindImageMagick: Find components in same locations as main package 
Fix component include/library path if multiple versions are installed.
When searching for individual components, look only in the locations
we expect to find them that we already computed.
 2018-04-11 11:32:09 -04:00
Brad King 61607fffbb Merge branch 'features-msvc-2017' into release-3.11 
Merge-request: !1903
 2018-04-11 11:30:02 -04:00
Daniel Filipe 5f4272cc06 Features: Record for VS 2017 through 15.6 
VS 15.3 has more features than we recorded in commit v3.7.0-rc1~156^2~2
(Features: Record features for VS 15 Preview 4, 2016-09-05).

While at it, update comments and simplify some cases.
 2018-04-11 11:27:07 -04:00
Andrea Ranieri 9174786008 FindwxWidgets: Use more private name for local variable 
Avoid using a `_filename` variable that may be set by project code.
Also unset the variable name that we do use to avoid conflict.
 2018-04-11 10:41:10 -04:00
Brad King aad0967e7d Merge branch 'release-3.11' 2018-04-11 10:34:11 -04:00
Brad King ded33659b1 Merge topic 'cpack-trace-nullptr' 
6f2701abf6 CPack: Fix crash on invalid generator name

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1950
 2018-04-11 10:33:48 -04:00
Craig Scott 952d72b79d Merge topic 'UseSWIG-bugfixes' 
963837cf17 UseSWIG: fix erroneous generator expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1947
 2018-04-11 08:01:00 -04:00
Kitware Robot bb1d1f160f CMake Nightly Date Stamp 2018-04-11 00:01:04 -04:00
Brad King 3c0fed488f Merge branch 'cpack-trace-nullptr' into release-3.11 
Merge-request: !1950
 2018-04-10 15:01:43 -04:00
Brad King 6f2701abf6 CPack: Fix crash on invalid generator name 
In commit v3.11.0-rc1~68^2 (CPack: accept --trace and --trace-expand,
2017-12-09) a nullptr dereference was added that occurs when
`cpack -G NotAGenerator` is invoked.  Add the needed condition.

Fixes: #17900
 2018-04-10 15:00:37 -04:00
Brad King 7eecf8ca50 Merge branch 'release-3.11' 2018-04-10 11:36:46 -04:00
Brad King 5c10e8f608 Merge topic 'fix-crash-trace-exp-uninit-vars' 
aad360eb3d Fix crash with --trace-expand --warn-uninitialized together

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1944
 2018-04-10 11:32:56 -04:00
Brad King 9fabee00ca Merge topic 'doc-install-export-android' 
4a127b78fd Help: Fix install(EXPORT_ANDROID_MK) mode documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1943
 2018-04-10 11:31:42 -04:00
Marc Chevrier 963837cf17 UseSWIG: fix erroneous generator expressions 
Add note regarding multi-config generators
 2018-04-10 11:28:32 +02:00
Kitware Robot e769e61f99 CMake Nightly Date Stamp 2018-04-10 00:01:06 -04:00
Raffi Enficiaud ffb1f19191 FindMatlab: add unit tests 2018-04-09 23:36:53 +02:00