summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* iOS: Only look for packages in the provided CMAKE_FIND_ROOT_PATHsAlexandru Croitor2019-04-301-0/+1
| | | | | | | | | | | | | | | Both CMAKE_FIND_ROOT_PATH_MODE_INCLUDE and CMAKE_FIND_ROOT_PATH_MODE_LIBRARY are set to "ONLY" when cross building to iOS, but appears that CMAKE_FIND_ROOT_PATH_MODE_PACKAGE was overlooked. This causes packages to be searched for in the host system as well, which is incorrect and can lead to linking issues. Set CMAKE_FIND_ROOT_PATH_MODE_PACKAGE to "ONLY" as well. CMAKE_FIND_ROOT_PATH_MODE_PROGRAM is not touched, because a user might want to find programs / tools on the host system.
* iOS: Allow setting multiple CMAKE_FIND_ROOT_PATH valuesAlexandru Croitor2019-04-301-1/+1
| | | | | | | | | | | | | Currently the value is hardcoded to contain only the sysroot for the respective darwin platform. This means that it can not be changed in a custom toolchain file. Instead of overriding the value, simply append it. This is similar to how it is done in the Google provided Android toolchain file. The usecase is to allow specifying addiitonal roots to look for 3rd party packages which are definitely not present in the default sysroot.
* iOS: Allow specifying CMAKE_MACOSX_BUNDLE in toolchain fileAlexandru Croitor2019-04-301-1/+3
| | | | | | | | | | Currently CMAKE_MACOSX_BUNDLE is always set to true when compiling for iOS. This poses a problem when using the source file variant of try_compile. Even if a custom value is passed via the CMAKE_FLAGS option, it would still be overridden by the Darwin.cmake file. Only set the value in case no other value was provided before.
* CMake Nightly Date StampKitware Robot2019-04-301-1/+1
|
* Merge topic 'intel_simulate'Kyle Edwards2019-04-291-0/+14
|\ | | | | | | | | | | | | a893018c47 Project: Report intel's simulation of gcc. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3264
| * Project: Report intel's simulation of gcc.R. Andrew Ohana2019-04-251-0/+14
| |
* | CMake Nightly Date StampKitware Robot2019-04-291-1/+1
| |
* | CMake Nightly Date StampKitware Robot2019-04-281-1/+1
| |
* | CMake Nightly Date StampKitware Robot2019-04-271-1/+1
| |
* | CMake Nightly Date StampKitware Robot2019-04-261-1/+1
|/
* Merge topic 'cmWorkerPool_Tweaks'Kyle Edwards2019-04-253-158/+156
|\ | | | | | | | | | | | | | | 56890ede2a cmWorkerPool: Factor our worker thread class (internals) 9794b72d38 cmWorkerPool: Set worker thread count separately to Process() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3260
| * cmWorkerPool: Factor our worker thread class (internals)Sebastian Holtermann2019-04-241-120/+106
| | | | | | | | | | | | This moves the `cmWorkerPoolInternal::WorkerT` class to `cmWorkerPoolWorker` and changes the thread start interface to make it independent of the `cmWorkerPoolInternal` type.
| * cmWorkerPool: Set worker thread count separately to Process()Sebastian Holtermann2019-04-243-39/+51
| | | | | | | | | | | | | | Don't pass the desired worker thread count to the `cmWorkerPool::Process()` method but set it separately with the new `cmWorkerPool::SetThreadCount` method. This allows calling `cmWorkerPool::Process()` repeatedly without having to pass the thread count every time.
* | CMake Nightly Date StampKitware Robot2019-04-251-1/+1
| |
* | Merge topic 'update-documentation'Kyle Edwards2019-04-2459-174/+184
|\ \ | | | | | | | | | | | | | | | | | | cb811d11ce Help: Improve description of modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3222
| * | Help: Improve description of modulesBartosz Kosiorek2019-04-2359-174/+184
| | |
* | | Merge topic 'ctest_xml_tweaks'Kyle Edwards2019-04-248-2/+56
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | | | | d8af0700a3 ctest: consistently format generator name 95db11fdb1 ctest: Include ChangeId in Update.xml Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3259
| * | ctest: consistently format generator nameZack Galbreath2019-04-232-2/+2
| | | | | | | | | | | | | | | | | | | | | Notes.xml and Upload.xml were missing a hyphen that the rest of our XML files included. ctest3.14.0-rc1 vs. ctest-3.14.0-rc1
| * | ctest: Include ChangeId in Update.xmlZack Galbreath2019-04-236-0/+54
| | |
* | | CMake Nightly Date StampKitware Robot2019-04-241-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2019-04-231-1/+1
| |
* | Merge branch 'release-3.14'Brad King2019-04-220-0/+0
|\ \
| * | CMake 3.14.3v3.14.3Brad King2019-04-221-1/+1
| | |
* | | Merge topic 'sunpro-cxx14-features'Brad King2019-04-223-0/+23
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 66f3f11af5 SunPro: Record support for C++14 features by SunPro 5.{14,15} Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3248
| * | | SunPro: Record support for C++14 features by SunPro 5.{14,15}Brad King2019-04-193-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | SunPro 5.15 supports `-std=c++14` and several C++14 features. SunPro 5.14 accepts `-std=c++14` but does not update its definition of `__cplusplus` or any other macro to distinguish it from `-std=c++11`, so we need to blacklist a couple features that do work but that we cannot report for that version. We can still support `cxx_std_14`. Co-Author: Robert Maynard <robert.maynard@kitware.com>
* | | | Merge topic 'msvc-warning-flags'Brad King2019-04-2214-5/+109
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1baf122cd4 MSVC: Do not add /W3 to CMAKE_<LANG>_FLAGS by default Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3250
| * | | | MSVC: Do not add /W3 to CMAKE_<LANG>_FLAGS by defaultBrad King2019-04-1914-5/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We do not add default warning flags on other compilers, and having a warning flag in the default flags makes it hard for projects to customize the warning level. They need to use string processing to remove `/W3` from `CMAKE_{C,CXX}_FLAGS`. Therefore we should drop it. However, projects may be using string processing to replace `/W3` with another flag, so we cannot simply drop it. Add a policy to drop it in a compatible way. Fixes: #18317
* | | | | Merge branch 'release-3.14'Brad King2019-04-220-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'findqt3-hints-fix' into release-3.14Brad King2019-04-221-5/+7
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !3254
| * \ \ \ \ Merge branch 'vs-default-platform' into release-3.14Brad King2019-04-1910-3/+40
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3246
* | \ \ \ \ \ Merge topic 'findqt3-hints-fix'Brad King2019-04-221-5/+7
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c298c4553b FindQt3: Restore missing lib and bin path suffixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3254
| * | | | | | FindQt3: Restore missing lib and bin path suffixesChristian Pfeiffer2019-04-221-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore path suffixes incorrectly removed by commit a62d50ec56 (Modules: Replace coded PATHS with PATH_SUFFIXES, 2017-11-20, v3.11.0-rc1~293^2). Hints do not participate in the usual bin/lib subdirectory search that `<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit. Fixes: #19185
* | | | | | | Merge topic 'vs-default-platform'Brad King2019-04-2210-3/+40
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | db02be85a0 VS: Provide the default platform name to project code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3246
| * | | | | | VS: Provide the default platform name to project codeBrad King2019-04-1910-3/+40
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The value of `CMAKE_VS_PLATFORM_NAME` is computed by Visual Studio generators based on `CMAKE_GENERATOR_PLATFORM` or some default. Prior to the VS 2019 generator, the default was always `Win32`. However, for the `Visual Studio 16 2019` generator, the default is based on the host platform. Store the default in a new `CMAKE_VS_PLATFORM_NAME_DEFAULT` variable for use by project code. This is particularly useful in toolchain files because they are allowed to set `CMAKE_GENERATOR_PLATFORM` and so `CMAKE_VS_PLATFORM_NAME` is not yet known. Of course the toolchain file author knows whether it will set `CMAKE_GENERATOR_PLATFORM`, and if not then `CMAKE_VS_PLATFORM_NAME_DEFAULT` provides the platform name that will be used. Fixes: #19177
* | | | | | CMake Nightly Date StampKitware Robot2019-04-221-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-04-211-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2019-04-201-1/+1
| |_|/ / / |/| | | |
* | | | | Merge topic 'test-find_package-resolve-symlinks'Brad King2019-04-192-8/+14
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9428fc473 Tests: Fix FindPackageTest when path to source has a symlink e27437d0e0 Tests/FindPackageTest: Tell Git to ignore temporary symlink path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3244
| * | | | Tests: Fix FindPackageTest when path to source has a symlinkBrad King2019-04-181-8/+13
| | | | | | | | | | | | | | | | | | | | Exclude a portion of the test that does not work in this case.
| * | | | Tests/FindPackageTest: Tell Git to ignore temporary symlink pathBrad King2019-04-181-0/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-04-191-1/+1
|/ / / /
* | | | Merge topic 'unique'Brad King2019-04-187-30/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ecb3f8d5c Ninja,Makefile: use `unique_ptr` for memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3230
| * | | | Ninja,Makefile: use `unique_ptr` for memory managementSaleem Abdulrasool2019-04-187-30/+21
| | | | | | | | | | | | | | | | | | | | | | | | | Use a `unique_ptr` to manage the lifetime of the `MacOSXContentGenerator` and 'OSXBundleGenerator` rather than manually handling the lifetime.
* | | | | Merge topic 'add_xl_cxx14_support'Brad King2019-04-183-0/+13
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 458ea9d76c XL: Add C++14 language level flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3235
| * | | | | XL: Add C++14 language level flagsRobert Maynard2019-04-153-0/+13
| |/ / / /
* | | | | Merge topic 'update-kwsys'Brad King2019-04-185-88/+78
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e47391400 bootstrap: Update for new KWSys configuration option fb15c27562 Merge branch 'upstream-KWSys' into update-kwsys 0225b05afe KWSys 2019-04-17 (c42b92f0) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3242
| * | | | | bootstrap: Update for new KWSys configuration optionBrad King2019-04-171-0/+2
| | | | | |
| * | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-04-174-88/+76
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-04-17 (c42b92f0)
| | * | | | | KWSys 2019-04-17 (c42b92f0)KWSys Upstream2019-04-174-88/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit c42b92f0fe01cf588aacc1984501b4fdcc58994e (master). Upstream Shortlog ----------------- Ben Boeckel (1): 84bd7c9e SystemTools: support hiding the translation map Sebastian Holtermann (8): 00a3a436 SystemTools: Update buffered env value string only on a change d6235796 SystemTools: Optimize iterator lifetime in JoinPath 9992f69b SystemTools: Optimize range loop in FindName method 8c9ca162 SystemTools: Optimize range loop in FindProgram method c7e3ab12 SystemTools: Optimize range loop in FindProgram method ac8d2033 SystemTools: Optimize range loop in FindLibrary method 815cc593 SystemTools: Optimize range loop in FindProgramPath method 5d8af0d6 SystemTools: Optimize range loop in RelativePath method
* | | | | | | CMake Nightly Date StampKitware Robot2019-04-181-1/+1
| | | | | | |
generated by cgit v0.12 at 2025-02-03 21:59:23 (GMT)