summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* UseSWIG: add policy to manage target naming strategy.Marc Chevrier2018-07-251-1/+3
|
* Merge topic 'project-injected-no-cmp0048'Craig Scott2018-07-252-2/+9
|\ | | | | | | | | | | | | | | 6646771b0f project: Do not issue CMP0048 warnings on injected call 08eb157c03 Tests: Add case showing CMP0048 warning on injected project command Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2235
| * project: Do not issue CMP0048 warnings on injected callBrad King2018-07-242-2/+9
| | | | | | | | Fixes: #18202
* | CMake Nightly Date StampKitware Robot2018-07-251-1/+1
| |
* | CMake Nightly Date StampKitware Robot2018-07-241-1/+1
| |
* | CMake Nightly Date StampKitware Robot2018-07-231-1/+1
| |
* | CMake Nightly Date StampKitware Robot2018-07-221-1/+1
| |
* | CMake Nightly Date StampKitware Robot2018-07-211-1/+1
| |
* | Merge topic 'doc-find_package-root'Craig Scott2018-07-201-2/+2
|\ \ | | | | | | | | | | | | | | | | | | 492ade276b Help: Add explicit <PackageName>_ROOT variable documentation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2225
| * | Help: Add explicit <PackageName>_ROOT variable documentationBrad King2018-07-201-2/+2
| |/ | | | | | | | | | | Add documentation for both the CMake variable and environment variable of this name pattern. Update references to these names to link to their documents. Clarify the pattern used to construct their names.
| * CMake 3.12.0v3.12.0Brad King2018-07-171-1/+1
| |
| * CMake 3.12.0-rc3v3.12.0-rc3Brad King2018-07-091-1/+1
| |
| * Merge branch 'csharp-link-file' into release-3.12Brad King2018-07-091-4/+7
| |\ | | | | | | | | | Merge-request: !2177
| * \ Merge branch 'revert-subdirectory-linking' into release-3.12Brad King2018-07-031-9/+2
| |\ \ | | | | | | | | | | | | Merge-request: !2191
* | \ \ Merge topic 'xcode-target-order'Brad King2018-07-202-240/+279
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fb45559e09 Xcode: Process targets in depth-first order during generation 0bad9eba46 Xcode: Refactor storage of ordered list of targets d0de296e50 Xcode: Factor target generation loop body into helper method 30e27b4110 Xcode: Compute global order index for targets e3469a5920 Xcode: Remove loop over local generators that has no effect Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2224
| * | | | Xcode: Process targets in depth-first order during generationBrad King2018-07-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Xcode 10 "new build system" requires more strict handling of custom commands. It may need a fix similar to what commit v3.12.0-rc1~171^2 (VS: Generate a custom command only in the least dependent target, 2018-03-23) did for VS. Prepare for this by generating targets within each local generator in dependency order. Issue: #18070
| * | | | Xcode: Refactor storage of ordered list of targetsBrad King2018-07-191-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Sort the resulting Xcode object list so that the actual order of generation does not matter.
| * | | | Xcode: Factor target generation loop body into helper methodBrad King2018-07-192-224/+231
| | | | |
| * | | | Xcode: Compute global order index for targetsBrad King2018-07-192-0/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Compute an index for each target in a global ordering such that no target comes before its dependencies.
| * | | | Xcode: Remove loop over local generators that has no effectBrad King2018-07-191-7/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Remove a loop over local generators whose body was dropped long ago by commit v2.6.0~1677 (Remove unused build rules from Xcode, 2007-05-28).
* | | | | CMake Nightly Date StampKitware Robot2018-07-201-1/+1
|/ / / /
* | | | Merge topic 'cpack_archive_typo'Brad King2018-07-191-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 22fbf39d9b CPack: Fix log typos (spaces in the wrong places) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2222
| * | | | CPack: Fix log typos (spaces in the wrong places)Sylvain Joubert2018-07-181-5/+5
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-07-191-1/+1
|/ / / /
* | | | Merge topic 'nvcc_dlink_dedup_static_libs'Brad King2018-07-181-5/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fd0523a215 CUDA: Properly de-duplicate libs when doing device linking b07c71831c CUDA: Add a test to verify device linking can handle circular deps Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2214
| * | | | CUDA: Properly de-duplicate libs when doing device linkingRobert Maynard2018-07-171-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nvcc device linker is designed so that each static library with device symbols only needs to be listed once as it doesn't care about link order. If you provide the same static library multiple times it will error out. To make sure this occurs we find the unique set of link items.
* | | | | CMake Nightly Date StampKitware Robot2018-07-181-1/+1
| | | | |
* | | | | Merge topic 'math-err'Brad King2018-07-178-89/+89
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 406f397e8b math: Restore toleration of unexpected characters in an expression dd5c54600b cmExprParserHelper: Simplify error state tracking 185bcface4 cmExprParserHelper: Remove some unused code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2218
| * | | | | math: Restore toleration of unexpected characters in an expressionBrad King2018-07-168-73/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to commit 7c4c13ffef (math: Reject unexpected expression input explicitly, 2018-05-18) we ignored unexpected characters in an expression that otherwise can be parsed. In order to preserve compatibility with projects that accidentally used this, convert the error to a warning.
| * | | | | cmExprParserHelper: Simplify error state trackingBrad King2018-07-161-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Errors always have explanation strings, so use the presence of such a string to track whether an error has occurred. This avoids an extra variable.
| * | | | | cmExprParserHelper: Remove some unused codeBrad King2018-07-162-10/+0
| | | | | |
* | | | | | Merge topic 'hex_file'Brad King2018-07-171-8/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f431789a9 Use isxdigit() to determine if a character is a hex digit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2213
| * | | | | | Use isxdigit() to determine if a character is a hex digitDevin Nakamura2018-07-131-8/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | Replace custom cm_IsHexChar with isxdigit from the stdlib
* | | | | | CMake Nightly Date StampKitware Robot2018-07-171-1/+1
| |/ / / / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2018-07-161-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-07-151-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-07-141-1/+1
| | | | |
* | | | | Merge topic 'autogen_forward_errors'Brad King2018-07-135-226/+348
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86b332c25d Return std::string from cmGeneratorTarget::ImportedGetLocation 189f723509 Autogen: Wrap moc/uic/rcc related variables in structs c6a8002827 Autogen: Improve error detection during configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2207
| * | | | | Return std::string from cmGeneratorTarget::ImportedGetLocationSebastian Holtermann2018-07-113-13/+6
| | | | | |
| * | | | | Autogen: Wrap moc/uic/rcc related variables in structsSebastian Holtermann2018-07-112-109/+120
| | | | | |
| * | | | | Autogen: Improve error detection during configurationSebastian Holtermann2018-07-113-121/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmQtAutoGenInitializer::InitCustomTargets and cmQtAutoGenInitializer::SetupCustomTargets now return their success value which gets evaluated and passed on by the caller (cmGlobalGenerator). Checks for the existance of the moc/uic/rcc binaries have been introduces in cmQtAutoGenInitializer. Additionally they get called once with a "-h" argument to determine if they're functional. This way any binary-not-found problem is caught during the configuration phase.
* | | | | | Merge topic 'cpack-wix-extra-sources'Brad King2018-07-131-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2134169f6 WiX: Add the build directory to IncludeSearchPaths for candle.exe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2194
| * | | | | | WiX: Add the build directory to IncludeSearchPaths for candle.exeLars Schmertmann2018-07-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPack creates cpack_variables.wxi in the build directory. In the WiX template it can be used by <?include "cpack_variables.wxi"?> because the template is configured into main.wxs in the build directory. Because the extra source files are in the source directory it was necessary to use <?include "$(sys.CURRENTDIR)_CPack_Packages\win32\WIX\cpack_variables.wxi"?>. This requires knowledge about the build directory structure and is avoided by this change by adding the build directory to the IncludeSearchPaths.
* | | | | | | Merge topic 'update-kwsys'Brad King2018-07-131-21/+28
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5a1491e90 Merge branch 'upstream-KWSys' into update-kwsys c454a1435a KWSys 2018-07-12 (86ce4f37) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2211
| * | | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-07-121-21/+28
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-07-12 (86ce4f37)
* | | | | | | CMake Nightly Date StampKitware Robot2018-07-131-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'ghs'Brad King2018-07-122-125/+167
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ce4f20ba62 GHS: Add release notes 281c601024 GHS: Update default BSP name 01c98c6ccc GHS: Update setting default OS location for Integrity platforms bb77dc0cee GHS: Set primary target using arch/platform values (or user specified value) f80692cf60 GHS: Add platform selection support a37a4a00c8 GHS: Add toolset selection support 5d40d2b44f GHS: Support ARM, PPC, 86 architectures Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Matt Soucy <matthew.soucy@baesystems.com> Merge-request: !798
| * | | | | | GHS: Update default BSP nameFred Baksik2018-07-111-10/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Use default value of sim<arch> if not user defined -- Also no reason to trim quotes or changes slashes; it is just a name not a path
| * | | | | | GHS: Set primary target using arch/platform values (or user specified value)Fred Baksik2018-07-111-2/+20
| | | | | | |
| * | | | | | GHS: Add platform selection supportFred Baksik2018-07-111-0/+10
| | | | | | |