summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmsting-stl-compatibility'Brad King2020-01-283-50/+165
|\ | | | | | | | | | | | | 8f839d02e3 cm::String: enhance compatibility with STL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4281
| * cm::String: enhance compatibility with STLMarc Chevrier2020-01-253-50/+165
| |
* | Merge topic 'QNX_CMAKE_SYSROOT'Brad King2020-01-281-1/+7
|\ \ | | | | | | | | | | | | | | | | | | 32a6ab1f3b QNX: Add support for CMAKE_SYSROOT Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4277
| * | 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 'cuda_runtime_library_controls'Brad King2020-01-286-34/+72
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0d0145138f CUDA: Add abstraction for cuda runtime selection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4178
| * | | CUDA: Add abstraction for cuda runtime selectionRobert Maynard2020-01-276-34/+72
| | | | | | | | | | | | | | | | | | | | Fixes #17559 Replace our hard-coded default of cudart=static with a first-class abstraction to select the runtime library from an enumeration of logical names.
* | | | CMake Nightly Date StampKitware Robot2020-01-281-1/+1
| | | |
* | | | Merge topic 'fix-ninja-multi-framework-header'Brad King2020-01-272-8/+26
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 63c9cd2088 Ninja Multi-Config: Fix bug with MacOS frameworks Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4279
| * | | | Ninja Multi-Config: Fix bug with MacOS frameworksKyle Edwards2020-01-242-8/+26
| | | | |
* | | | | Merge topic 'depend-on-target-real-name'Brad King2020-01-271-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08699cec68 add_custom_command: Fix dependency on macOS framework target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4273
| * | | | | add_custom_command: Fix dependency on macOS framework targetBrad King2020-01-241-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the `DEPENDS` option names a logical target name, convert to the "real" path of that target rather than any of the symlink-provided alternative file names. This makes the dependencies consistent with the outputs named by link rules producing the target artifacts. Fixes: #20264
* | | | | | Merge topic 'csharp-no-valued-macros'Brad King2020-01-271-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | effd4d0569 CSharp: Do not pass definitions with values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4267
| * | | | | | CSharp: Do not pass definitions with valuesSumit Bhardwaj2020-01-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Microsoft C# tooling does not accept definitions with values. Filter them out. Fixes: #19817
* | | | | | | Merge topic 'cpack-dmg-breaklongline'Brad King2020-01-271-2/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a3a7d5f5d CPack/DragNDrop: Fix word corruption in BreakLongLines Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4275
| * | | | | | | CPack/DragNDrop: Fix word corruption in BreakLongLinesKoray Kilinc2020-01-241-2/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | When the lines are wrapped the leading characters of the next word were being lost
* | | | | | | Merge topic 'cpack-dmg-rtf-for-sla'Brad King2020-01-271-10/+31
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9571929701 CPack/DragNDrop: Support RTF licenses Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4270
| * | | | | | | CPack/DragNDrop: Support RTF licensesAndrew Fuller2020-01-241-10/+31
| |/ / / / / /
* | | | | | | Merge topic 'makefiles-suppress-vcs-implicit-rules'Brad King2020-01-271-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 879e56f336 makefiles: suppress RCS and SCCS implicit rules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4264
| * | | | | | | makefiles: suppress RCS and SCCS implicit rulesBen Boeckel2020-01-241-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These are not suffix rules and are not suppressed by the empty `.SUFFIXES` recipe. Additionally, the old `SUFFIXES =` code didn't actually accomplish this, so remove it.
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-271-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2020-01-261-1/+1
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2020-01-251-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'ninja-multi-cross-configs'Brad King2020-01-243-14/+64
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | b7a2baf38c Ninja Multi-Config: Add variable to control configs used in cross-config build Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4269
| * | | | | Ninja Multi-Config: Add variable to control configs used in cross-config buildKyle Edwards2020-01-233-14/+64
| | |/ / / | |/| | |
* | | | | 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
| | | | | | |
generated by cgit v0.12 at 2025-02-21 00:50:36 (GMT)