summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmMakefile: Simplify GetExecutionContext implementationBrad King2020-09-281-6/+1
| | | | | | | | This method takes the function name and line from the top of the current backtrace and then gets the file path from the state's `GetExecutionListFile`. This exactly matches what the `cmMakefileCall` constructor does to create the top of the current backtrace anyway, so we can just take that directly.
* cmListFileCache: Add explicit constructorsBrad King2020-09-281-0/+8
| | | | | In order to construct with an initializer list in pure C++11, add the explicit constructors.
* Merge topic 'ci-cxx11'Brad King2020-09-281-0/+4
|\ | | | | | | | | | | | | | | a258283160 ci: convert one build to cover strict C++11 usage Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5285
| * ci: convert one build to cover strict C++11 usageBrad King2020-09-281-0/+4
| | | | | | | | | | | | Without this, we do not cover compilation with only C++11 until nightly testing, at which point many builds require it, and failures block merging anything that was staged.
* | Merge topic 'cmake-gui-slot-connections'Kyle Edwards2020-09-287-149/+180
|\ \ | |/ |/| | | | | | | | | | | ab8f6fdd8c CMake GUI: Modernize signal-slot connections Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ben Boeckel <ben.boeckel@kitware.com> Merge-request: !5278
| * CMake GUI: Modernize signal-slot connectionsKyle Edwards2020-09-277-149/+180
| | | | | | | | | | | | | | Qt5 supports passing function pointers to QObject::connect(), and prefers this over SIGNAL() and SLOT(). Modernize the connections, stop using a deprecated signal from QComboBox, and modernize a few QKeySequence's.
* | Merge topic 'vs-generator-platform-install-prefix'Brad King2020-09-281-0/+4
|\ \ | | | | | | | | | | | | | | | | | | 561d4b4a47 VS: Fix CMAKE_INSTALL_PREFIX with GENERATOR_PLATFORM for x64 and ARM Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5272
| * | VS: Fix CMAKE_INSTALL_PREFIX with GENERATOR_PLATFORM for x64 and ARMRechi2020-09-251-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Generate the same default `CMAKE_INSTALL_PREFIX` if a project is configured with CMAKE_GENERATOR_PLATFORM (`cmake -G "Visual Studio [...]" -A x64` and `cmake -G "Visual Studio [...]" -A ARM`) instead of the prior CMake 3.1 way (`cmake -G "Visual Studio [...] Win64"` and `cmake -G "Visual Studio [...] ARM"`).
* | | Merge topic 'pkg_config_detailed_error'Brad King2020-09-281-2/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab8bd48352 FindPkgConfig: Search for pkg-config.bat file on a Windows host 3201dd521e FindPkgConfig: Show more info when pkg-config --version fails Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5273
| * | | FindPkgConfig: Search for pkg-config.bat file on a Windows hostAlexandru Croitor2020-09-251-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The strawberry perl distribution ships a pkg-config file and a pkg-config.bat file. find_program() does not usually look for a .bat file program unless explicitly specified in the NAMES argument. This would cause CMake to find the non-bat file, and executing that with execute_process() leads to a '%1 is not a valid Win32 application' error. Prefer to search for pkg-config.bat file when on a Windows host, in additiona to the regular pkg-config file. Fixes: #21239
| * | | FindPkgConfig: Show more info when pkg-config --version failsAlexandru Croitor2020-09-251-1/+3
| |/ / | | | | | | | | | Fixes: #21239
* | | Merge topic 'xcode-restore-ios-tests'Brad King2020-09-281-14/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2092ab08fe xcode: conditionally enable combined install tests 62ce9e16e0 xcode: annotate test output with selected SDK Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5271
| * | | xcode: conditionally enable combined install testsGregor Jasny2020-09-251-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new Xcode 12 build system does not support recursive invocation. Therefore lazily triggered builds for the corresponding platform which run during the `install` target fail with: ``` error: unable to attach DB: error: accessing build database ``` While looking for a work-around we conditionally disable those tests. Issue: #21206
| * | | xcode: annotate test output with selected SDKGregor Jasny2020-09-251-8/+8
| | | |
* | | | Merge topic 'FPHSA-fix-spurious-error'Brad King2020-09-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1e82b1c4bc FPHSA: avoid spurious error if version variable is not defined Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5277
| * | | | FPHSA: avoid spurious error if version variable is not definedMarc Chevrier2020-09-251-1/+1
| | |_|/ | |/| | | | | | | | | | Fixes: #21241
* | | | Merge topic 'libuv-qnx'Brad King2020-09-284-2/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f9e950d4c5 libuv: Add support for building for QNX within CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5200
| * | | | libuv: Add support for building for QNX within CMakeElad Lahav2020-09-254-2/+26
| | |/ / | |/| |
* | | | Merge branch 'release-3.18'Brad King2020-09-280-0/+0
|\ \ \ \
| * \ \ \ Merge topic 'FindJNI-aarch64' into release-3.18Brad King2020-09-281-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 696d16ae6c FindJNI: Add aarch64 support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Vitaly Lipatov <lav@etersoft.ru> Merge-request: !5275
* | \ \ \ \ Merge topic 'FindJNI-aarch64'Brad King2020-09-281-1/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 696d16ae6c FindJNI: Add aarch64 support Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Vitaly Lipatov <lav@etersoft.ru> Merge-request: !5275
| * | | | | FindJNI: Add aarch64 supportBrad King2020-09-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the fix from commit 44dffbcc94 (FindJNI: Add arm64 support, 2020-08-25, v3.18.3~21^2) to cover the `aarch64` name too. Fixes: #21237
* | | | | | CMake Nightly Date StampKitware Robot2020-09-281-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-09-271-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2020-09-261-1/+1
| |_|_|/ / |/| | | |
* | | | | Merge topic 'find_package_module_mode_print_debug_message'Brad King2020-09-251-0/+16
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b423a20ce1 FindPackage: Provide better debug message when <PKG_FOUND> is false a7acafc977 FindPackage: find_package(MODULE) respects CMAKE_FIND_DEBUG_MODE Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5256
| * | | | | FindPackage: Provide better debug message when <PKG_FOUND> is falseRobert Maynard2020-09-221-0/+11
| | | | | |
| * | | | | FindPackage: find_package(MODULE) respects CMAKE_FIND_DEBUG_MODERobert Maynard2020-09-221-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fixes #21216
* | | | | | Merge topic 'cuda_clang_separable'Brad King2020-09-2522-124/+502
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c63fe01835 CUDA: Clang separable compilation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5221
| * | | | | | CUDA: Clang separable compilationRaul Tambre2020-09-2422-124/+502
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For NVCC the compiler takes care of device linking when passed the "-dlink" flag. Clang doesn't support such magic and requires the buildsystem to do the work that NVCC does behind the scenes. The implementation is based on Bazel's device linking documentation: https://github.com/tensorflow/tensorflow/blob/7cabcdf073abad8c46e9dda62bb8fa4682d2061e/third_party/nccl/build_defs.bzl.tpl#L259 Closes: #20726
* | | | | | Merge topic 'xcode-12-new-build-system'Brad King2020-09-252-16/+21
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0a67c3ebe1 Xcode: Remove dependency Makefile hacks under the "new build system" c6c7f6fbeb Xcode: Remove remnants of ancient XCODE_DEPEND_HELPER utility target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5267
| * | | | | | Xcode: Remove dependency Makefile hacks under the "new build system"Brad King2020-09-241-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The original Xcode build system did not properly re-link targets that consumed object libraies. We worked around that with a post-build command on the object libraries themselves that removed their consumers if out of date. The "new build system" does not appear to need such help, so drop the workaround.
| * | | | | | Xcode: Remove remnants of ancient XCODE_DEPEND_HELPER utility targetBrad King2020-09-242-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The target has not been generated since commit d92d51429e (BUG: fix for bug 6193, fix xcode depend helper, 2008-01-10, v2.6.0~553). Remove it from the list of special targets.
* | | | | | | Merge branch 'release-3.18'Brad King2020-09-250-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge topic 'clang-llvm-lib' into release-3.18Brad King2020-09-251-1/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5d3da091b Clang: Look for llvm-lib when using MSVC-like front-end Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr> Merge-request: !5264
* | \ \ \ \ \ \ Merge topic 'clang-llvm-lib'Brad King2020-09-251-1/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f5d3da091b Clang: Look for llvm-lib when using MSVC-like front-end Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Thomas Bernard <thomas@famillebernardgouriou.fr> Merge-request: !5264
| * | | | | | | Clang: Look for llvm-lib when using MSVC-like front-endShoaib Meenai2020-09-241-1/+2
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 55196a1440 (MSVC: Use 'lib' instead of 'link /lib' to create static libraries, 2020-01-10, v3.18.0-rc1~625^2) we changed CMake to use lib instead of `link /lib` to create static libraries, but it didn't search for `llvm-lib`. If you have `llvm-lib` but not `lib` (e.g. when cross-compiling), when `CMakeFindBinutils` is invoked for the `C` and `CXX` languages, `CMAKE_AR` is not found. When it's subsequently invoked for the ASM language, `CMAKE_ASM_SIMULATE_ID` and `CMAKE_ASM_COMPILER_FRONTEND_VARIANT` are not set (because `CMakeDetermineASMCompiler` doesn't call `CMAKE_DETERMINE_COMPILER_ID`, which sets those variables), so we go down the non-MSVC conditional and set `CMAKE_AR` to a GNU-style `ar`, which of course does not understand lib flags. Explicitly search for `llvm-lib` to avoid this situation.
* | | | | | | Merge topic 'linux-_FILE_OFFSET_BITS-64'Brad King2020-09-251-0/+6
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b10f96793 Linux: Compile with _FILE_OFFSET_BITS=64 on 32-bit Linux Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Marc Chevrier <marc.chevrier@gmail.com> Merge-request: !5258
| * | | | | | Linux: Compile with _FILE_OFFSET_BITS=64 on 32-bit LinuxMarc Chevrier2020-09-231-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid problems accessing filesystem, use 64-bit file offsets when compilation model is 32-bit. This explicit definition is needed now that KWSys does not provide LFS settings in its headers anymore. Fixes: #20568
* | | | | | | CMake Nightly Date StampKitware Robot2020-09-251-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'update-libuv'Brad King2020-09-2449-536/+1602
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a0506bafe libuv: Suppress conversion warning on Windows 2269ad6a0a libuv: Add fs_copy stub to cmake-bootstrap.c e21325c2c6 Merge branch 'upstream-libuv' into update-libuv c1463f959f libuv 2020-09-22 (ed5b42d5) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5259
| * | | | | | libuv: Suppress conversion warning on WindowsBrad King2020-09-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a cast to avoid the conversion warning with minimal changes to third-party code.
| * | | | | | libuv: Add fs_copy stub to cmake-bootstrap.cBrad King2020-09-231-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is now called by `uv__fs_sendfile` in `src/unix/fs.c` but we do not need that feature during CMake bootstrap.
| * | | | | | Merge branch 'upstream-libuv' into update-libuvBrad King2020-09-2348-536/+1594
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-libuv: libuv 2020-09-22 (ed5b42d5)
| | * | | | | | libuv 2020-09-22 (ed5b42d5)libuv upstream2020-09-2348-537/+1593
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit ed5b42d5b70b69f4c84f99e4112233375b17d6a4 (v1.x).
* | | | | | | | Merge topic 'zstd-1.4.5'Brad King2020-09-2466-3972/+7723
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ca54e7179 zstd: version 1.4.5 update 0b3e9259dd Merge branch 'upstream-zstd' 4676ad8c32 zstd 2020-05-21 (b706286a) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5260
| * | | | | | | | zstd: version 1.4.5 updateCristian Adam2020-09-232-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add source files needed to properly compile / link to zstd version 1.4.5
| * | | | | | | | Merge branch 'upstream-zstd'Cristian Adam2020-09-2364-3971/+7719
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By zstd upstream * upstream-zstd: zstd 2020-05-21 (b706286a)
| | * | | | | | | | zstd 2020-05-21 (b706286a)zstd upstream2020-09-2364-3971/+7719
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/facebook/zstd.git at commit b706286adbba780006a47ef92df0ad7a785666b6 (v1.4.5).
* | | | | | | | | | Merge topic 'cmake-gui-tests'Brad King2020-09-2424-9/+458
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1dcc569828 gitlab-ci: Add GUI testing to each OS 4c6e5cd0fa Tests: Add some basic tests for CMake GUI 41e223deb3 CMake GUI: Split up into libraries, add test shim b7995b62f0 QCMakeCacheView: Default to nullptr for parent Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !5224
generated by cgit v0.12 at 2025-01-30 05:20:10 (GMT)