summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'swift-debug-variant'Brad King2019-05-221-13/+10
|\ | | | | | | | | | | | | 62381effba Ninja,Swift: reuse `SWIFT_MODULE_NAME` for `SWIFT_MODULE` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3343
| * Ninja,Swift: reuse `SWIFT_MODULE_NAME` for `SWIFT_MODULE`Saleem Abdulrasool2019-05-201-13/+10
| | | | | | | | | | | | | | | | | | | | Rather than compute the value of `SWIFT_MODULE`, use the computed value of `SWIFT_MODULE_NAME`. This is helpful strictly for Windows where you have multiple configuration variants with differing ABIs that need must co-exist. In particular, this re-use permits the use of `CMAKE_DEBUG_POSTFIX` to have the import library and the DLL be named with the trailing suffix but have the same import name for the swift module and interface.
* | Merge topic 'vs-ApplicationTypeRevision'Brad King2019-05-223-10/+22
|\ \ | | | | | | | | | | | | | | | | | | | | | 9c07cefee5 VS: Fix ApplicationTypeRevision in builtin check projects 639e14def6 VS: Factor out helper to compute ApplicationTypeRevision Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3350
| * | VS: Fix ApplicationTypeRevision in builtin check projectsBrad King2019-05-211-2/+2
| | | | | | | | | | | | | | | | | | | | | Do not use the entire `CMAKE_SYSTEM_VERSION`, but rather the first two components only. Fixes: #19275
| * | VS: Factor out helper to compute ApplicationTypeRevisionBrad King2019-05-213-8/+20
| |/ | | | | | | This is the first two components of `CMAKE_SYSTEM_VERSION`.
* | Merge topic 'ninja-lib-symlink-space'Brad King2019-05-221-1/+3
|\ \ | | | | | | | | | | | | | | | | | | 13c92b4a30 Ninja: Fix creation of library symlinks in folders with spaces Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3341
| * | Ninja: Fix creation of library symlinks in folders with spacesEike Ziller2019-05-201-1/+3
| | | | | | | | | | | | | | | The arguments to 'cmake -E cmake_symlink_library' must be properly quoted.
* | | Merge topic 'file-remove-no-empty'Craig Scott2019-05-221-0/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a1eb03569d file: Change REMOVE to ignore empty names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3349
| * | | file: Change REMOVE to ignore empty namesBrad King2019-05-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously code like file(REMOVE_RECURSE "${accidentally_missing_variable}") treated the empty string as a relative path with respect to the current directory and removed its contents. Change this behavior to ignore the empty string with a warning instead. Normally such behavior changes are done with a policy, but in this case such code is likely a real bug in project code that can delete data. Fixes: #19274
* | | | CMake Nightly Date StampKitware Robot2019-05-221-1/+1
| | | |
* | | | Merge topic 'string-param'Brad King2019-05-2111-57/+58
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | 273257222e Source: change parameters to std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3340
| * | | Source: change parameters to std::stringVitaly Stakhovsky2019-05-1911-57/+58
| | | |
* | | | CMake Nightly Date StampKitware Robot2019-05-211-1/+1
| |_|/ |/| |
* | | Merge topic 'makefiles_additional_clean_files'Brad King2019-05-205-97/+108
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f945c3e755 Tests: Extend MakeClean test to cover subdirectories without targets 1ded3599d6 Makefiles: Process ADDTIONAL_CLEAN_FILES dir prop at directory level 827da1119e Makefiles: Make build root targets "all", "clean" and "preinstall" recursive adc3459707 Makefiles: Avoid pointer repurposing 0d41b45cc9 Makefiles: Inline range loop range arguments Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3338
| * | | Makefiles: Process ADDTIONAL_CLEAN_FILES dir prop at directory levelSebastian Holtermann2019-05-185-18/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the "Unix Makefiles" generator, the `ADDTIONAL_CLEAN_FILES` directory property was evaluated on a per target basis. This had two drawbacks: - per directory clean files were repeated in every target clean script - per directory clean files weren't removed in directories without targets (issue #8164) This patch moves the `ADDTIONAL_CLEAN_FILES` directory property processing from the target to the directory level clean target. Fixes: #8164 "ADDITIONAL_CLEAN_FILES directory property not respected if no target present in directory"
| * | | Makefiles: Make build root targets "all", "clean" and "preinstall" recursiveSebastian Holtermann2019-05-181-39/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the "Unix Makefiles" generator, the subdirectory targets "all", "clean" and "preinstall" in Makefile2 are recursive. In the build root directory, these targets aren't. Instead they're are added separately and additional dependencies are added on a per target basis. This is inconsistent and it complicates per directory commands, like a per directory clean command. This patch makes the "all", "clean" and "preinstall" targets in Makefile2 in the build root directory recursive, using the same algorithm that is already used for subdirectories. Some side effects are: - Makefile2 gets smaller and simpler - The main "all", "clean" and "preinstall" targets have recursive dependencies, instead of flat (depth of 1) ones.
| * | | Makefiles: Avoid pointer repurposingSebastian Holtermann2019-05-171-4/+4
| | | |
| * | | Makefiles: Inline range loop range argumentsSebastian Holtermann2019-05-172-36/+17
| | | |
* | | | Merge topic 'ninja-swift'Brad King2019-05-206-122/+189
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9180ccf9a Tests: add a check for the Swift compiler d745551fb6 Help: add some initial documentation for Swift support 9a182c9e5b Auxiliary: update vim syntax highlighting e9b0063e8e Modules: add build rules for Swift Ninja support b6412e3e38 Ninja: add placeholders to support Swift build 7d7f31161d Ninja: add support for Swift's output-file-map.json d688c4c19d Swift: remove unnecessary unreleased Ninja infrastructure 0723582208 Swift: Detect compiler version ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3297
| * | | | Ninja: add placeholders to support Swift buildSaleem Abdulrasool2019-05-164-1/+115
| | | | | | | | | | | | | | | | | | | | Add the placeholders needed to support compiling Swift code.
| * | | | Ninja: add support for Swift's output-file-map.jsonSaleem Abdulrasool2019-05-162-4/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an emitter for the Swift's output-map-file.json to emit the requisite support files for Swift compilation. This additionally prevents the build rules for the object file emission as well to properly support the Swift build semantics.
| * | | | Swift: remove unnecessary unreleased Ninja infrastructureSaleem Abdulrasool2019-05-164-126/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This cleans up the new options that were added to support Swift. This was not released, and the proper support approach that we settled upon does not require as much specialised support.
* | | | | Merge topic 'interface-library-export-properties'Brad King2019-05-201-0/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 73a829e078 InterfaceLibrary: Whitelist EXPORT_PROPERTIES property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3336
| * | | | InterfaceLibrary: Whitelist EXPORT_PROPERTIES propertyBrad King2019-05-171-0/+1
| | | | | | | | | | | | | | | | | | | | Fixes: #19261
* | | | | CMake Nightly Date StampKitware Robot2019-05-201-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2019-05-191-1/+1
| | | |
* | | | Merge topic 'file-install-follow-symlink-chain'Marc Chevrier2019-05-182-7/+66
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3ff7ced63 file(INSTALL): Add FOLLOW_SYMLINK_CHAIN argument Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Brad King <brad.king@kitware.com> Merge-request: !3332
| * | | | file(INSTALL): Add FOLLOW_SYMLINK_CHAIN argumentKyle Edwards2019-05-162-7/+66
| | |/ / | |/| |
* | | | CMake Nightly Date StampKitware Robot2019-05-181-1/+1
| |_|/ |/| |
* | | Merge topic 'autogen_ninja_clean'Brad King2019-05-172-10/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 93ee7dd044 Autogen: Update documentation for ADDITIONAL_CLEAN_FILES 4b4fd99f41 Autogen: Use ADDITIONAL_CLEAN_FILES target property for file cleaning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3327
| * | | Autogen: Use ADDITIONAL_CLEAN_FILES target property for file cleaningSebastian Holtermann2019-05-152-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `ADDITIONAL_CLEAN_FILES` target property works on multiple generators to remove addition files at the clean target. In `AUTOGEN` use it instead of the deprecated and limited `ADDITIONAL_MAKE_CLEAN_FILES` directory property to remove `AUTOGEN` generated files. Fixes: #17074 "Autogen: clean target with ninja generator doesn’t clean autogen files"
* | | | Merge topic 'offer_compiler_lang_generator_expression'Brad King2019-05-171-0/+46
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e214abdaab Genex: Add COMPILE_LANG_AND_ID generator expression f84ed796a2 Docs: Generator-expressions remove usage of `CMake-id` Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3300
| * | | | Genex: Add COMPILE_LANG_AND_ID generator expressionRobert Maynard2019-05-141-0/+46
| | | | |
* | | | | Merge topic 'string-cleanup'Brad King2019-05-1718-91/+87
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23e8364aed Source: std::string related cleanup Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Sebastian Holtermann <sebholt@web.de> Merge-request: !3324
| * | | | Source: std::string related cleanupVitaly Stakhovsky2019-05-1518-91/+87
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2019-05-171-1/+1
| |_|_|/ |/| | |
* | | | Merge topic 'update-kwsys'Brad King2019-05-162-20/+83
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23b3ca5e1f Merge branch 'upstream-KWSys' into update-kwsys 49f8351a18 KWSys 2019-05-15 (dea11658) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3325
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2019-05-152-20/+83
| | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2019-05-15 (dea11658)
* | | | | CMake Nightly Date StampKitware Robot2019-05-161-1/+1
| | | | |
* | | | | Merge topic 'msvc-jmc'Brad King2019-05-152-0/+27
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | 2a9ff9703e MSVC: Add support for /JMC (Just My Code) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3121
| * | | | MSVC: Add support for /JMC (Just My Code)Luca Cappa2019-05-142-0/+27
| | | | |
* | | | | Merge topic 'additional_clean_files'Brad King2019-05-1513-44/+226
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b5bf369ec6 Release notes: Add release notes for ADDITIONAL_CLEAN_FILES properties 4e2ce0a67a Doc: Update and deprecate ADDITIONAL_MAKE_CLEAN_FILES directory property 338994d65d Doc: Add documentation for ADDITIONAL_CLEAN_FILES properties c11f089d73 Tests: Extend MakeClean test to cover ADDITIONAL_CLEAN_FILES 012d599e26 Ninja: Add support for ADDITIONAL_CLEAN_FILES target property 890a1b9dc3 Ninja: Add support for ADDITIONAL_CLEAN_FILES directory property 7b23001f20 Ninja: Add support for additional clean files d745df4b01 Makefiles: Add support for ADDITIONAL_CLEAN_FILES target property ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3318
| * | | | | Ninja: Add support for ADDITIONAL_CLEAN_FILES target propertySebastian Holtermann2019-05-143-0/+29
| | | | | |
| * | | | | Ninja: Add support for ADDITIONAL_CLEAN_FILES directory propertySebastian Holtermann2019-05-142-0/+27
| | | | | |
| * | | | | Ninja: Add support for additional clean filesSebastian Holtermann2019-05-142-7/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Additional clean files for the Ninja generator can be registered via the new method `cmGlobalNinjaGenerator::AddAdditionalCleanFile`. If there are additional clean files, a new rule `CLEAN_ADDITIONAL` and a new build target `CMakeFiles/clean.additional` get generated. The `clean` target will depend on `CMakeFiles/clean.additional`, if the target exists.
| * | | | | Makefiles: Add support for ADDITIONAL_CLEAN_FILES target propertySebastian Holtermann2019-05-141-0/+12
| | | | | |
| * | | | | Makefiles: Add support for ADDITIONAL_CLEAN_FILES directory propertySebastian Holtermann2019-05-141-0/+12
| | | | | |
| * | | | | Makefiles: Move ADDITIONAL_MAKE_CLEAN_FILES evaluation to lambdaSebastian Holtermann2019-05-141-10/+16
| | | | | |
| * | | | | Makefiles: Sort clean files by using a std::set<std::string> containerSebastian Holtermann2019-05-146-30/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By using a `std::set<std::string>` container instead of a `std::vector<std::string>` container, the clean files list becomes sorted and unique. The clean target in Makefiles beomes nicer and better readable this way. Also double clean entries won't appear anymore.
* | | | | | Merge topic 'ninja-pool-custom-command'Brad King2019-05-1511-28/+78
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f76961de8 Support job pools in custom commands and targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3308
generated by cgit v0.12 at 2025-02-08 07:50:19 (GMT)