mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-20 14:10:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
48,945 Commits 2 Branches 391 Tags
a0bca7e9cc799b6329b497d43ee6bc8edfa1407f
Commit Graph

48945 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott
a0bca7e9cc Merge topic 'doc-FRAMEWORK_MULTI_CONFIG_POSTFIX_CONFIG' 
3bb287581c Help: FRAMEWORK_MULTI_CONFIG_POSTFIX example should use actual config

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4973
 2020-07-06 05:53:05 -04:00
Kitware Robot
c68c744497 CMake Nightly Date Stamp 2020-07-06 00:02:07 -04:00
Craig Scott
3bb287581c Help: FRAMEWORK_MULTI_CONFIG_POSTFIX example should use actual config 2020-07-05 16:26:46 +10:00
Kitware Robot
fdd90a4b66 CMake Nightly Date Stamp 2020-07-05 00:02:37 -04:00
Kitware Robot
940857844e CMake Nightly Date Stamp 2020-07-04 00:02:39 -04:00
Brad King
12497c56a9 Merge topic 'cpack-dmg-sla' 
b9737ead1f Tests: Add case for CPack DMG multi-language SLAs
925c026c31 Tests: Verify SLA in CPackComponentsForAll-DragNDrop-* DMG files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4969
 2020-07-03 07:34:47 -04:00
Brad King
6b246f9198 Merge topic 'darwin-init-var-cleanup' 
2af6857562 Darwin: prefix internal osx variables with "_" to hide them from users

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4967
 2020-07-03 07:34:11 -04:00
Chuck Cranor
2af6857562 Darwin: prefix internal osx variables with "_" to hide them from users 
A simple CMakeLists.txt on osx shows that variable "d" is set
(but empty) by the system modules.  this pollutes the user's
variable namespace.  I noticed this when I created a library
target "d" and got unexpected policy CMP0054 warnings when
trying to find_package(d CONFIG REQUIRED) (triggered from the
generated "d-targets.cmake" ...).   Note that non-"_" prefixed
internal variables are ok within functions due to scoping rules.

Fixes: #20898
 2020-07-03 07:33:25 -04:00
Brad King
bc27f26fbc Merge topic 'xcode-lang-mm' 
258c8734a9 Xcode: Fix LANGUAGE property on .m/.mm files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4965
 2020-07-03 07:32:06 -04:00
Harry Mallon
258c8734a9 Xcode: Fix LANGUAGE property on .m/.mm files 
When OBJC or OBJCXX is enabled as a language, prefer that for .m and .mm
source file language selection.

Fixes: #20257
 2020-07-03 07:30:50 -04:00
Brad King
476b6be497 Merge topic 'find-libraries-NAMES_PER_DIR' 
0d9d8dd054 FindPNG use NAMES_PER_DIR
e6908b65b4 FindGIF use NAMES_PER_DIR
45ea7f9c80 FindGLEW use NAMES_PER_DIR
8e671f2564 FindLAPACK use NAMES_PER_DIR
ec6bbfd58d FindIntl use NAMES_PER_DIR
667a229e8d FindProtobuf use NAMES_PER_DIR
64d37b4953 FindLibLZMA use NAMES_PER_DIR
9d2c119ff5 FindJPEG use NAMES_PER_DIR
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4961
 2020-07-03 07:27:44 -04:00
Brad King
b902da418d Merge topic 'restore-cwd-translation-map' into release-3.18 
85a945a607 Restore handling of build directory inside a symlinked path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4963
 2020-07-03 07:25:31 -04:00
Brad King
7a435c82f0 Merge branch 'release-3.18' 2020-07-03 07:25:31 -04:00
Brad King
977f5ed3d1 Merge topic 'restore-cwd-translation-map' 
85a945a607 Restore handling of build directory inside a symlinked path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4963
 2020-07-03 07:25:31 -04:00
Kitware Robot
bfa645c599 CMake Nightly Date Stamp 2020-07-03 00:03:17 -04:00
Brad King
b9737ead1f Tests: Add case for CPack DMG multi-language SLAs 
Add a test for the feature added by commit f88533cc06 (CPackDMG: Add
support for multilingual SLAs, 2015-10-19, v3.5.0-rc1~232^2).

Issue: #20889
 2020-07-02 16:39:57 -04:00
Brad King
925c026c31 Tests: Verify SLA in CPackComponentsForAll-DragNDrop-* DMG files 
Issue: #20889
 2020-07-02 16:39:57 -04:00
Brad King
29d2d4805f Merge topic 'refactor_cmmakefile_language_standards_methods' 
dc94b0249e cmStandardLevelResolver: Added to handle standard level queries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4932
 2020-07-02 08:39:26 -04:00
Brad King
b516ada836 Merge topic 'FindGTest-no_release_support' 
a064b18f85 FindGTest: Allow either "Debug" or "Release" configurations.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4950
 2020-07-02 08:37:51 -04:00
Brad King
edce450e03 Merge topic 'gtest-xml-add-test' 
7b92e11683 Tests: Add test for GoogleTest XML_OUTPUT_DIR

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4954
 2020-07-02 08:37:00 -04:00
Brad King
41d9a934a7 Merge branch 'release-3.18' 2020-07-02 08:34:28 -04:00
Brad King
55a9298ac6 Merge topic 'FindLua-5.4' into release-3.18 
bbb7f0e271 FindLua: Add support for Lua 5.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4959
 2020-07-02 08:34:27 -04:00
Brad King
ba889a0b28 Merge topic 'FindLua-5.4' 
bbb7f0e271 FindLua: Add support for Lua 5.4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4959
 2020-07-02 08:34:27 -04:00
Brad King
6935ffd550 Merge topic 'update-curl' into release-3.18 
6d423195d5 Merge branch 'upstream-curl' into update-curl
4446fda8e0 curl 2020-06-30 (5a1fc8d3)
4e9685f657 curl: Update script to get curl 7.71.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4958
 2020-07-02 08:32:54 -04:00
Brad King
918bf65294 Merge branch 'release-3.18' 2020-07-02 08:32:54 -04:00
Brad King
8a4dc44361 Merge topic 'update-curl' 
6d423195d5 Merge branch 'upstream-curl' into update-curl
4446fda8e0 curl 2020-06-30 (5a1fc8d3)
4e9685f657 curl: Update script to get curl 7.71.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4958
 2020-07-02 08:32:54 -04:00
Brad King
eef098ec31 Merge topic 'uv-check-return' into release-3.18 
0fddcc1e5b cmake: Tolerate nullptr from uv_default_loop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4962
 2020-07-02 08:31:31 -04:00
Brad King
fe46332fb9 Merge branch 'release-3.18' 2020-07-02 08:31:31 -04:00
Brad King
4eb2e50730 Merge topic 'uv-check-return' 
0fddcc1e5b cmake: Tolerate nullptr from uv_default_loop

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Kyle Edwards <kyle.edwards@kitware.com>
Merge-request: !4962
 2020-07-02 08:31:31 -04:00
Brad King
85a945a607 Restore handling of build directory inside a symlinked path 
In commit dd8365b3f1 (Merge branch 'upstream-KWSys' into update-kwsys,
2020-04-06, v3.18.0-rc1~397^2) we imported KWSys commit `019afb6ea`
(SystemTools: Drop GetCurrentWorkingDirectory 'collapse' argument,
2020-04-03).  That caused `GetCurrentWorkingDirectory` to no longer send
paths through the KWSys translation map and broke CMake's detection of
the absolute path to a build directory containing a symbolic link.
Add our own `cmSystemTools::GetCurrentWorkingDirectory` wrapper around
the KWSys method in order to restore that mapping.

Test-case-by: Ben Boeckel <ben.boeckel@kitware.com>
Issue: #16228
Fixes: #20900
 2020-07-02 07:33:16 -04:00
Kitware Robot
b028e8c50e CMake Nightly Date Stamp 2020-07-02 00:02:41 -04:00
Brad King
0fddcc1e5b cmake: Tolerate nullptr from uv_default_loop 
`uv_default_loop()` can return `nullptr` when running on a Linux kernel
configured without `CONFIG_EVENTFD`.

Fixes: #20899
 2020-07-01 16:26:44 -04:00
Sibi Siddharthan
0d9d8dd054 FindPNG use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:44:08 +05:30
Sibi Siddharthan
e6908b65b4 FindGIF use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:43:40 +05:30
Sibi Siddharthan
45ea7f9c80 FindGLEW use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:43:04 +05:30
Sibi Siddharthan
8e671f2564 FindLAPACK use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:42:24 +05:30
Sibi Siddharthan
ec6bbfd58d FindIntl use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:42:02 +05:30
Sibi Siddharthan
667a229e8d FindProtobuf use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:41:17 +05:30
Sibi Siddharthan
64d37b4953 FindLibLZMA use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:40:36 +05:30
Sibi Siddharthan
9d2c119ff5 FindJPEG use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:40:09 +05:30
Sibi Siddharthan
a2a1d5a038 FindIconv use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:39:12 +05:30
Sibi Siddharthan
943bdc7fbd FindEXPAT use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:38:40 +05:30
Sibi Siddharthan
6c77c61532 FindCURL use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:38:11 +05:30
Sibi Siddharthan
739278e971 FindBZip2 use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:37:34 +05:30
Sibi Siddharthan
764696dcd0 FindBLAS use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:37:04 +05:30
Sibi Siddharthan
903a65ce0d FindArmadillo use NAMES_PER_DIR 
Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
 2020-07-02 00:36:14 +05:30
Felix Yan
bbb7f0e271 FindLua: Add support for Lua 5.4 2020-07-01 10:55:32 -04:00
Brad King
6d423195d5 Merge branch 'upstream-curl' into update-curl 
* upstream-curl:
  curl 2020-06-30 (5a1fc8d3)
 2020-07-01 10:10:23 -04:00
Curl Upstream
4446fda8e0 curl 2020-06-30 (5a1fc8d3) 
Code extracted from:

    https://github.com/curl/curl.git

at commit 5a1fc8d33808d7b22f57bdf9403cda7ff07b0670 (curl-7_71_1).
 2020-07-01 10:09:50 -04:00
Brad King
4e9685f657 curl: Update script to get curl 7.71.1 2020-07-01 10:09:40 -04:00