summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'upstream-curl' into update-curlBrad King2019-05-22171-5993/+6565
|\ | | | | | | | | * upstream-curl: curl 2019-05-22 (885ce314)
| * curl 2019-05-22 (885ce314)Curl Upstream2019-05-22171-5995/+6567
| | | | | | | | | | | | | | | | Code extracted from: https://github.com/curl/curl.git at commit 885ce31401b6789c959131754b1e5ae518964072 (curl-7_65_0).
* | curl: Update script to get curl 7.65.0Brad King2019-05-221-1/+1
| |
* | Merge topic 'default-generator-env'Brad King2019-05-2237-11/+267
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | d0f0ba0f7a Tests: Add environment generator tests a48ce8f4bf Help: Add documentation for default generator environment variables 083cf7e8a2 cmake: Allow default generator to be set by environment variables Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3218
| * | Tests: Add environment generator testsEicke Herbertz2019-05-2224-0/+128
| | |
| * | Help: Add documentation for default generator environment variablesEicke Herbertz2019-05-2211-5/+68
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Documentation for environment variables that control the default generator selection: * CMAKE_GENERATOR * CMAKE_GENERATOR_INSTANCE * CMAKE_GENERATOR_PLATFORM * CMAKE_GENERATOR_TOOLSET
| * | cmake: Allow default generator to be set by environment variablesEicke Herbertz2019-05-162-6/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there is no Generator available in the Cache, this will read CMAKE_GENERATOR from environment before using the CMake platform default. If CMAKE_GENERATOR is empty, use the platform default. If a environment default generator is specified, subsequent variables CMAKE_GENERATOR_(INSTANCE,PLATFORM,TOOLSET) are also evaluated in the same way.
* | | Merge topic 'remove_unneeded_device_link_calls'Brad King2019-05-2210-136/+164
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 81b4d10d8f CUDA: More exhaustive checks to determine when to do device linking 3205c7c950 cmNinjaLinkLineDeviceComputer now lives in the correct source file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3320
| * | | CUDA: More exhaustive checks to determine when to do device linkingRobert Maynard2019-05-217-108/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously CMake used fairly naive logic to determine when to do device linking which caused unnecessary device linking to occur frequently. We now use a more exhaustive algorithm to determine when we have a need for device linking. Fixes: #19238
| * | | cmNinjaLinkLineDeviceComputer now lives in the correct source fileRobert Maynard2019-05-206-34/+57
| | | |
* | | | Merge topic 'find-package-prefer-config'Brad King2019-05-2210-51/+155
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 26a99da206 find_package: Add option to prefer Config mode c365243a3a find_package: Factor out module and config find_package methods Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Ruslan Baratov <ruslan_baratov@yahoo.com> Merge-request: !3339
| * | | | find_package: Add option to prefer Config modeCristian Adam2019-05-219-43/+134
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a `CMAKE_FIND_PACKAGE_PREFER_CONFIG` variable to tell `find_package` calls to look for a package configuration file first even if a find module is available. Fixes: #16805, #19236
| * | | | find_package: Factor out module and config find_package methodsCristian Adam2019-05-202-50/+63
| | | | |
* | | | | 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-224-12/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-212-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'compiler-id-arch-only-iar'Brad King2019-05-222-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c0fb923b7 IAR: Do not print compiler architecture id for non-IAR compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3352
| * | | | | IAR: Do not print compiler architecture id for non-IAR compilersBrad King2019-05-212-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler identification message was modified in commit ea83d0f8fb (IAR: Generalize and add support for IAR RX compiler, 2019-04-05) to include the architecture id since IAR compilers are arch-specific. Revise the logic to avoid modifying the message for other compilers.
* | | | | | 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 branch 'release-3.14'Brad King2019-05-220-0/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'libarchive-solaris-11.4' into release-3.14Brad King2019-05-211-5/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3351
* | \ \ \ \ \ \ \ Merge topic 'libarchive-solaris-11.4'Brad King2019-05-221-5/+5
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c81c6538b libarchive: avoid b64_encode name conflict with Solaris built-in function Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3351
| * | | | | | | | libarchive: avoid b64_encode name conflict with Solaris built-in functionBrad King2019-05-211-5/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Solaris 11.4 has a built-in function named `b64_encode`. Add a `la_` prefix to our internal function to avoid conflict. Fixes: #19268
* | | | | | | | Merge topic 'file-remove-no-empty'Craig Scott2019-05-226-1/+29
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-216-1/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | | | | | | | |
* | | | | | | | | Merge topic 'FindPostgreSQL-config-support'Brad King2019-05-212-13/+51
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 368bcba28a FindPostgreSQL: Find debug lib, imported configs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3298
| * | | | | | | | | FindPostgreSQL: Find debug lib, imported configsAndrei Lebedev2019-05-202-13/+51
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add find_library calls for debug and release * Set imported configs for corresponding libraries in imported target * Set debug/optimized in PostgreSQL_LIBRARIES Signed-off-by: Andrei Lebedev <lebdron@gmail.com>
* | | | | | | | | Merge topic 'doc-ipo-check'Brad King2019-05-211-1/+3
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a59662bb5b Help: Add CheckIPOSupported link to INTERPROCEDURAL_OPTIMIZATION Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3333
| * | | | | | | | Help: Add CheckIPOSupported link to INTERPROCEDURAL_OPTIMIZATIONRuslan Baratov2019-05-171-1/+3
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2019-05-211-1/+1
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge topic 'makefiles_additional_clean_files'Brad King2019-05-207-132/+172
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Tests: Extend MakeClean test to cover subdirectories without targetsSebastian Holtermann2019-05-182-35/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a subdirectory to the MakeClean test, in which files are added to the `ADDITIONAL_CLEAN_FILES` directory property, but which holds no targets.
| * | | | | | | | 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-2027-156/+477
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | Tests: add a check for the Swift compilerSaleem Abdulrasool2019-05-174-3/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This ensures that the tests only run when the Swift compiler is present.
| * | | | | | | | | Help: add some initial documentation for Swift supportSaleem Abdulrasool2019-05-1611-0/+78
| | | | | | | | | |
| * | | | | | | | | Auxiliary: update vim syntax highlightingSaleem Abdulrasool2019-05-161-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add new Swift keywords to the highlighting rules.
| * | | | | | | | | Modules: add build rules for Swift Ninja supportSaleem Abdulrasool2019-05-164-24/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add rules to support building Swift sources using Ninja.
| * | | | | | | | | 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.
generated by cgit v0.12 at 2025-01-01 08:25:53 (GMT)