summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'bootstrap-system-http2'Brad King2020-07-211-2/+4
|\ | | | | | | | | | | | | | | 64bc82bb4d bootstrap: Add options to control use of system nghttp2 Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Christoph Grüninger <foss@grueninger.de> Merge-request: !5031
| * bootstrap: Add options to control use of system nghttp2Brad King2020-07-201-2/+4
| | | | | | | | | | | | | | | | Add `bootstrap` options needed since commit 0b872fd4be (nghttp2: Build the library within CMake for use by our curl, 2020-04-01, v3.18.0-rc1~408^2~2). Fixes: #20987
* | Merge branch 'release-3.18'Brad King2020-07-210-0/+0
|\ \
| * \ Merge topic 'strdup' into release-3.18Brad King2020-07-211-0/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | eea0337c7d centos5: Fix FTBFS with strdup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5026
* | \ \ Merge topic 'strdup'Brad King2020-07-211-0/+4
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | eea0337c7d centos5: Fix FTBFS with strdup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5026
| * | | centos5: Fix FTBFS with strdupJulien Schueller2020-07-201-0/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | Since commit f034b0f663 (CMake compilation: do not use compiler extensions, 2020-03-14, v3.18.0-rc1~494^2) we need to explicitly enable availability of `strdup`. Fixes: #20971
* | | Merge branch 'release-3.18'Craig Scott2020-07-210-0/+0
|\ \ \ | | |/ | |/|
| * | Merge topic 'xcode-native-arch' into release-3.18Craig Scott2020-07-215-1/+41
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26673bf480 Xcode: Explicitly specify default native architecture on macOS ce624cfbd4 cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in member Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5023
* | \ \ Merge topic 'xcode-native-arch'Craig Scott2020-07-215-1/+41
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | 26673bf480 Xcode: Explicitly specify default native architecture on macOS ce624cfbd4 cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in member Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5023
| * | | Xcode: Explicitly specify default native architecture on macOSBrad King2020-07-204-1/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When `CMAKE_OSX_ARCHITECTURES` is not specified, we add the Xcode setting `ONLY_ACTIVE_ARCH = YES` with the intention of targeting the native architecture of the host. However, the default `ARCHS` value chosen by "Xcode 12 Universal Apps" includes multiple architectures. Add an explicit `ARCHS` setting with value `$(NATIVE_ARCH_ACTUAL)` to tell Xcode to use the host's native architecture only. Fixes: #20893
| * | | cmGlobalXCodeGenerator: Save CMAKE_SYSTEM_NAME in memberBrad King2020-07-162-0/+9
| | |/ | |/|
* | | CMake Nightly Date StampKitware Robot2020-07-211-1/+1
| | |
* | | Merge topic 'fix-xcode12-arm64-tests'Brad King2020-07-202-1/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 447ecbb692 Apple: also specify sysroot for linking 16692f4926 Apple: suppress Xcode 12 ranlib warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5028
| * | | Apple: also specify sysroot for linkingGregor Jasny2020-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | Otherwise the compiler/linker will default to the wrong C++ runtime library.
| * | | Apple: suppress Xcode 12 ranlib warningGregor Jasny2020-07-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode 12 (Beta) toolchain for arm64 emits a warning when static libraries are created: ``` ranlib: archive member: libStaticLib.a(a.c.o) offset in archive not a multiple of 8 (must be since member is an 64-bit object file) ``` Due to the unexpected output multiple tests are broken. To make those tests pass we filter the problematic output in the test driver. See: https://developer.apple.com/forums/thread/652620
* | | | Merge branch 'release-3.18'Brad King2020-07-200-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge topic 'swift-link-iface' into release-3.18Brad King2020-07-202-0/+4
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 14a5712447 Swift: Fix regression in linking to interface libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5027
* | \ \ \ Merge topic 'swift-link-iface'Brad King2020-07-202-0/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 14a5712447 Swift: Fix regression in linking to interface libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5027
| * | | | Swift: Fix regression in linking to interface librariesBrad King2020-07-172-0/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 2026915f8f (Swift: Propagate Swift_MODULE_DIRECTORY as include directory, 2020-02-03, v3.18.0-rc1~547^2) we internally call `GetAllConfigCompileLanguages` on all directly linked targets without checking if they are interface libraries that don't compile at all. That violates an internal assumption and assertion. Fixes: #20977
* | | | CMake Nightly Date StampKitware Robot2020-07-201-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-07-191-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2020-07-181-1/+1
| |_|/ |/| |
* | | Merge topic 'FindX11-Xaw'Brad King2020-07-173-0/+42
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | fa7157b86d FindX11: Add Xaw libraries Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5024
| * | | FindX11: Add Xaw librariesKurt Sansom2020-07-163-0/+42
| | | | | | | | | | | | | | | | Fixes: #20963
* | | | Merge topic 'xcode-try_compile-no-sign'Brad King2020-07-171-0/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3a64c4e3f Xcode: Explicitly turn off signing in try_compile projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5022
| * | | | Xcode: Explicitly turn off signing in try_compile projectsBrad King2020-07-161-0/+6
| |/ / / | | | | | | | | | | | | Fixes: #18407, #20571, #20688
* | | | Merge branch 'release-3.17'Brad King2020-07-170-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'ninja-multi-rsp' into release-3.17Brad King2020-07-161-4/+14
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !5020
* | \ \ \ \ Merge branch 'release-3.18'Brad King2020-07-170-0/+0
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Merge topic 'ninja-multi-rsp' into release-3.18Brad King2020-07-171-4/+14
| |\ \ \ \ \ | | | |/ / / | | |/| | / | | |_|_|/ | |/| | | | | | | | | | | | | 99ed39b011 Ninja Multi-Config: Make link response files per-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5020
* | | | | Merge topic 'ninja-multi-rsp'Brad King2020-07-171-4/+14
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 99ed39b011 Ninja Multi-Config: Make link response files per-config Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5020
| * | | | Ninja Multi-Config: Make link response files per-configKyle Edwards2020-07-161-4/+14
| | | | | | | | | | | | | | | | | | | | Fixes: #20961
* | | | | CMake Nightly Date StampKitware Robot2020-07-171-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'cmake-E-create_hardlink'Brad King2020-07-1613-0/+90
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2fad00940d cmake: Add -E create_hardlink Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5015
| * | | | cmake: Add -E create_hardlinkSibi Siddharthan2020-07-1513-0/+90
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20950 Signed-off-by: Sibi Siddharthan <sibisiddharthan.github@gmail.com>
* | | | | Merge topic 'move_more_queries_to_cmStandardLevelResolver'Brad King2020-07-165-153/+161
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56cf509a72 Move AddCompilerRequirementFlag to cmStandardLevelResolver Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4989
| * | | | | Move AddCompilerRequirementFlag to cmStandardLevelResolverRobert Maynard2020-07-155-153/+161
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmLocalGenerator::AddCompilerRequirementFlag was another source of truth on what standard levels existed per language, so fold that into cmStandardLevelResolver to make updating CMake easier
* | | | | | Merge topic 'macOS-sdk-latest'Brad King2020-07-162-21/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 17e13fb6d0 macOS: Always pick latest SDK if user has not set one explicitly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5012
| * | | | | | macOS: Always pick latest SDK if user has not set one explicitlyTor Arne Vestbø2020-07-142-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Apple tech note QA1806 recommends always building against the latest SDK. Fixes: #20949
* | | | | | | CMake Nightly Date StampKitware Robot2020-07-161-1/+1
| | | | | | |
* | | | | | | Merge topic 'cmnonempty'Kyle Edwards2020-07-1519-58/+69
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eaad8072ee cmNonempty: Convenience inlines to check for non-empty string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5017
| * | | | | | cmNonempty: Convenience inlines to check for non-empty stringVitaly Stakhovsky2020-07-1419-58/+69
| | |/ / / / | |/| | | |
* | | | | | Merge branch 'release-3.18'Brad King2020-07-150-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | CMake 3.18.0v3.18.0Brad King2020-07-151-1/+1
| | | | | |
* | | | | | Merge topic 'xcode-lib-refs'Brad King2020-07-152-58/+161
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3603ca8e86 Xcode: Special treatment for directly linked framework binaries e637744c51 Xcode: Use "Link Binary With Libraries" to link any library Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4975
| * | | | | | Xcode: Special treatment for directly linked framework binariesGusts Kaksis2020-07-141-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Always refer to framework directory instead of binary directly.
| * | | | | | Xcode: Use "Link Binary With Libraries" to link any libraryGusts Kaksis2020-07-142-58/+148
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add external libraries as fileRefs to Xcode project and add those references to Link Binary With Libraries build phase. This allows linking .a, .o, .dylib, .framework and .tbd libraries through "Link Binary With Libraries" build phase, as opposed to `OTHER_LINKER_FLAGS`. This improves on the approach added by commit 58c05e1c73 (Xcode: Use "Link Binary With Libraries" build phase when possible, 2020-06-12).
* | | | | | | Merge topic 'compi-ti-improvements'Brad King2020-07-155-38/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98fea8205e Compiler/TI: Avoid response file usage for linker 5dec322f33 Compiler/TI: Add compiler flags to linker 763b44e519 Compiler/TI: Avoid usage of ranlib ef528f10bf Compiler/TI: Sync ASM settings to C/CXX a548a52230 Compiler/TI: Refactor C/CXX to use a common file 195aa488e3 Compiler/TI: Detect architecture Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5010
| * | | | | | | Compiler/TI: Avoid response file usage for linkerJosef Angstenberger2020-07-141-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The object and library files have to be listed after the `--run-linker` flag. But after this flag the `--cmd_file` flag for response files cannot be used any more. Putting the whole command line into a response file would work, but this is not supported by CMake (yet).
| * | | | | | | Compiler/TI: Add compiler flags to linkerJosef Angstenberger2020-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By adding the compiler flags via `<FLAGS>` to the linker call, the linker can decide which default library to use. CMake replaces `<FLAGS>` by the content of `CMAKE_<LANG>_FLAGS`. So any relevant flag needs to be defined in this variable, preferably in a toolchain file. The compiler flags have to be specified before the `--run_linker` flag and the linker flags afterwards. Replaces Merge-request !4890