summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* QNX: Add support for CMAKE_SYSROOTStephen Kelly2020-01-271-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QCC is a wrapper around GCC, but it is not a fully transparent wrapper. Some compile options need to be passed to GCC using a `-Wc` option. QCC does not support --sysroot, so setting CMAKE_SYSROOT in a toolchain file currently does not work. This means that it is likely that no one is setting CMAKE_SYSROOT in existing QNC toolchain files. Override the GCC option for sysroot in the QCC.cmake file with -Wc,-isysroot. This exposes a further issue in that the QNX SDK does not follow the same architectural folder structure as linux uses. That is, on linux systems, architecture-specific libraries might be in <sysroot>/usr/lib/<arch> such as /usr/lib/x86_64-linux-gnu/libcurl.so CMake models this by suffixing the <arch> onto lib directories when searching for libraries. The QNX SDK is structured differently such that the <arch> should be used as a prefix: <sysroot>/<arch>/usr/lib such as <sysroot>/x86_64/usr/lib/libcurl.so Add a variable for platform configuration to set whether to prefix or suffix the <arch> and set that in the QCC.cmake. Use the directory structure of the QNX SDK to compute the <arch> from the implicit library directories. The assumption is that the arch will be a single directory directly below the CMAKE_SYSROOT, below which the usr/ prefix occurs. It would not be appropriate to instruct users to make the <arch> part of the sysroot when specified in the toolchain file because: 1. That would be non-DRY - The QCC wrapper already determines the <arch> by the -V argument passed to the compiler, specified in the toolchain file as the CMAKE_C_COMPILER_TARGET variable. 2. The includes in the QNX SDK are not below the <arch> directory. So, the location of the <arch> in the full path is different on QNX compared to, say an embedded linux platform, but the intent is the same. Add documentation to recommend the use of CMAKE_SYSROOT in a QNX toolchain file. As the CMAKE_SYSROOT is always the same for QNX, it would be possible to simply set it in QCC.cmake. However, that would change behavior for existing users as when CMAKE_SYSROOT is set, files/paths outside of the CMAKE_SYSROOT do not get found. The <arch> prefixing is only enabled in cmSearchPath.cxx if CMAKE_SYSROOT is set. This ensures that the user gets consistency in the current state without CMAKE_SYSROOT, and gets better consistency when using CMAKE_SYSROOT.
* Merge topic 'vs-dotnet-standard-core'Brad King2020-01-242-17/+31
|\ | | | | | | | | | | | | ae1e1909a1 VS: Add support for .NET Standard and .NET Core Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4240
| * VS: Add support for .NET Standard and .NET CoreJoerg Bornemann2020-01-242-17/+31
| | | | | | | | Fixes: #20105
* | Merge topic 'trace_json_timestamp'Brad King2020-01-241-0/+3
|\ \ | | | | | | | | | | | | | | | | | | | | | c829f0cfca trace: Add time and stack level to JSON output format Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Volo Zyko <volo.zyko@gmail.com> Merge-request: !4242
| * | trace: Add time and stack level to JSON output formatFrank Winklmeier2020-01-221-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Add the timestamp and stack depth of the function call to the JSON trace output format. This information can be useful for cmake profiling and call stack inspection (see e.g. https://github.com/volo-zyko/cmake-profile-stats). Improve unit test to allow for varying set of keys to check in trace lines.
* | | Merge topic 'multi-ninja-no-cleandead'Brad King2020-01-241-2/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6cc74b6140 cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-Multi Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4261
| * | | cmGlobalNinjaGenerator: avoid cleandead and recompact in Ninja-MultiBen Boeckel2020-01-231-2/+11
| | | | | | | | | | | | | | | | Fixes: #20247
* | | | CMake Nightly Date StampKitware Robot2020-01-241-1/+1
| | | |
* | | | Merge topic 'organize_makefile_help_output'Kyle Edwards2020-01-231-8/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c1470f146 Makefiles: Organize help output to group 'like' targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4260
| * | | | Makefiles: Organize help output to group 'like' targetsRobert Maynard2020-01-221-8/+23
| | | | |
* | | | | Merge topic 'get-runtime-dependencies-keyword-args'Brad King2020-01-231-3/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3573f62a16 Merge branch 'backport-get-runtime-dependencies-keyword-args' c998c8d560 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments 4c8a917a87 file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4262
| * | | | | file(GET_RUNTIME_DEPENDENCIES): Tolerate empty list argumentsKyle Edwards2020-01-221-3/+15
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Also list all keywords that were missing values instead of only the first one.
* | | | | Merge topic 'ninja-multi-default-build-alias'Brad King2020-01-238-72/+195
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8337ed0d73 Ninja Multi-Config: Add variable to control aliases in build.ninja 110037369d Refactor: Split Ninja files into impl-<Config>.ninja and build-<Config>.ninja e62a3414f7 Refactor: Move common.ninja into CMakeFiles Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4238
| * | | | | Ninja Multi-Config: Add variable to control aliases in build.ninjaKyle Edwards2020-01-222-13/+35
| | | | | |
| * | | | | Refactor: Split Ninja files into impl-<Config>.ninja and build-<Config>.ninjaKyle Edwards2020-01-228-66/+166
| | | | | |
| * | | | | Refactor: Move common.ninja into CMakeFilesKyle Edwards2020-01-221-1/+2
| |/ / / /
* | | | | CMake Nightly Date StampKitware Robot2020-01-231-1/+1
|/ / / /
* | | | Merge topic 'ninja-restat-just-build.ninja'Kyle Edwards2020-01-221-5/+19
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb2da206d9 cmGlobalNinjaGenerator: only restat build.ninja Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4245
| * | | | cmGlobalNinjaGenerator: only restat build.ninjaBen Boeckel2020-01-211-5/+19
| | |/ / | |/| | | | | | | | | | This reduces the work that ninja needs to do on a CMake reconfigure.
* | | | Merge topic 'mark_as_advanced-without-cache'Brad King2020-01-222-6/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3ec82b713e cmMarkAsAdvancedCommand: ignore variables which don't exist in the cache 701a5c60e0 cmake: avoid marking local or unused variables as advanced af158149e7 FindOpenSSL: do not mark a local variable as advanced 74f659f1f2 FindCurses: only mark CURSES_EXTRA_LIBRARY when it is used 7e2ae4e96d FindOpenGL: only mark declared cache variables as advanced 7cc02a0c29 FindLua: only mark LUA_MATH_LIBRARY as advanced if required 85cd26b8a6 FindBoost: only mark Boost_DIR as advanced if defined 338c7916ba CTest: avoid marking undeclared cache variables as advanced ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4150
| * | | | cmMarkAsAdvancedCommand: ignore variables which don't exist in the cacheBen Boeckel2020-01-202-6/+61
| | | | | | | | | | | | | | | | | | | | Fixes: #18331
* | | | | Merge topic 'modernize-memory-management'Brad King2020-01-222-33/+31
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | edab5add57 cmMakefileTargetGenerator: modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4250
| * | | | | cmMakefileTargetGenerator: modernize memory managementMarc Chevrier2020-01-212-33/+31
| | |_|/ / | |/| | |
* | | | | Merge topic 'install-std-string'Brad King2020-01-2213-42/+44
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5e54b0cf2f cmInstallGenerator: std::string params Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4255
| * | | | | cmInstallGenerator: std::string paramsVitaly Stakhovsky2020-01-2113-42/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Several construction parameters converted to std::string Also made a few class members const
* | | | | | Merge topic 'vs-std-string'Brad King2020-01-222-50/+45
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e768924f3 cmLocalVisualStudio7Generator: clean up c_str() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4249
| * | | | | | cmLocalVisualStudio7Generator: clean up c_str()Vitaly Stakhovsky2020-01-202-50/+45
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-221-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'install-std-string'Brad King2020-01-2117-119/+122
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9db532f44d cmInstall*Generator: std::string params Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4241
| * | | | | cmInstall*Generator: std::string paramsVitaly Stakhovsky2020-01-2117-119/+122
| |/ / / / | | | | | | | | | | | | | | | | | | | | Several construction parameters converted to std::string Also made a few class members const
* | | | | CMake Nightly Date StampKitware Robot2020-01-211-1/+1
|/ / / /
* | | | Merge topic 'multi-ninja-pch'Brad King2020-01-204-131/+149
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a55df20499 Multi-Ninja: Add precompile headers support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4201
| * | | | Multi-Ninja: Add precompile headers supportCristian Adam2020-01-174-131/+149
| | | | | | | | | | | | | | | | | | | | Fixes: #19789
* | | | | Merge topic 'realpath-cache'Brad King2020-01-203-2/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9d5a554cc9 cmGlobalGenerator: Add cache for realpath() results Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4220
| * | | | | cmGlobalGenerator: Add cache for realpath() resultsTim Blechmann2020-01-163-2/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache the results of `realpath()` system calls in `cmGlobalGenerator` to avoid repeating such calls for the same paths over and over.
* | | | | | Merge topic 'autogen_rcc_skip_unity'Brad King2020-01-202-14/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 086d9b2bab Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Cristian Adam <cristian.adam@gmail.com> Merge-request: !4237
| * | | | | | Autogen: Enable SKIP_UNITY_BUILD_INCLUSION on AUTORCC generated filesSebastian Holtermann2020-01-172-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `rcc` generated files are not compatible with unity builds, because they contain classes in anonymous namespaces and static data with identical names. This patch sets the source file property `SKIP_UNITY_BUILD_INCLUSION` to `On` on all `AUTORCC` generated files to exclude them from unity build files. Fixes: #20191 "QT5: Exclude resource files from unity build"
* | | | | | | Merge topic 'acc-fix-in-source-depends-path'Brad King2020-01-203-6/+21
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba3a417dce Tests/CustomCommand: add a test for depending on a `./path` e23475dc73 Tests/CustomCommand: fix custom command line to actually make its output db4780d584 cmGeneratorTarget: search for relative paths to the binary directory ec479f101f cmLocalGenerator: collapse the path after construction fd0ba705ce add_custom_command: check if a relative path should be an in-source path fd84f510f8 cmLocalGenerator: simplify the current source dir query Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4195
| * | | | | | cmGeneratorTarget: search for relative paths to the binary directoryBen Boeckel2020-01-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Dependencies in the form `./somepath.txt` are not found otherwise because we only match on last-path-component searches and `.` never shows up in a full path as a full component.
| * | | | | | cmLocalGenerator: collapse the path after constructionBen Boeckel2020-01-161-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The path may contain `..` or `.` components naïvely, so compute them out before letting the generator handle them.
| * | | | | | add_custom_command: check if a relative path should be an in-source pathBen Boeckel2020-01-162-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This still is broken for dependencies on generated paths where they get generated to the source directory rather than the build directory however, but there's no way to determine that is the case. Fixes: #20194
| * | | | | | cmLocalGenerator: simplify the current source dir queryBen Boeckel2020-01-161-2/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-201-1/+1
| | | | | | |
* | | | | | | Merge topic 'pch-msvc-no-path-repetition'Craig Scott2020-01-191-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 07fe1bcd4e PCH: No repeated path for internal generated PCH files (MSVC case) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4236
| * | | | | | | PCH: No repeated path for internal generated PCH files (MSVC case)Cristian Adam2020-01-161-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19952
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-191-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-181-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Merge topic 'out-of-dir-link-list'Brad King2020-01-176-126/+180
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f0e67da061 target_link_libraries: Fix out-of-dir linking of a list of targets acee629103 cmTargetLinkLibrariesCommand: Move HandleLibrary to helper struct ba675f1ecc Tests: Enable CMP0022 in ExportImport out-of-dir linking case Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4226
| * | | | | | | target_link_libraries: Fix out-of-dir linking of a list of targetsBrad King2020-01-166-71/+108
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In a case like target_link_libraries(targetInOtherDir PUBLIC "$<1:a;b>") then all entries in the list need to be looked up in the caller's scope. Previously our `::@(directory-id)` suffix would apply only to the last entry. Instead surround the entire entry by a pair `::@(directory-id);...;::@` so that the `::@` syntax can encode a directory lookup scope change evaluated as the list is processed. Fixes: #20204
| * | | | | | | cmTargetLinkLibrariesCommand: Move HandleLibrary to helper structBrad King2020-01-161-65/+82
| | | | | | | |
generated by cgit v0.12 at 2025-09-17 23:02:24 (GMT)