summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* 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).
* 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
| | | |
| * | | GHS: Add toolset selection supportFred Baksik2018-07-112-117/+107
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- Use the specified toolset located within GHS_TOOLSET_ROOT -- Update how the latest toolset is determined; scan the location GHS_TOOLSET_ROOT and sort it No longer use registry settings looking for installations The registry values are assigned in installation order for Green Hills tools not version order -- Update to use gbuild.exe from the proper toolset -- Clarify that CMAKE_MAKE_PROGRAM should not be set by user. -- Detect some toolset changes when regenerating project files This could occur if GHS_TOOLSET_ROOT was changed by user after the initial project generation This could occur if CMAKE_MAKE_PROGRAM was changed at the command line -- Use placeholder values for CMAKE_<LANG>_COMPILER The MULTI build system only uses gbuild to build a project gbuild uses the project file to determine which set of compilers to use based on target platform and architecture because compiler detection is skipped, placeholder values are used so that CMake does not complain
| * | | GHS: Support ARM, PPC, 86 architecturesFred Baksik2018-07-072-3/+24
| | | | | | | | | | | | | | | | | | | | | | | | -- Update -A option to choose target architecture. -- Update commentary about which variables are used to control toolset and target settings -- Remove setting CMAKE_SYSTEM_PROCESSOR because the value is overwritten to be "" by subsequent CMAKE processing
* | | | Merge topic 'option_respects_existing_stack_variable'Brad King2018-07-121-26/+36
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | f8a7cf85ad option: No CMP077 warnings when both cache and local variable exists Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2203
| * | | option: No CMP077 warnings when both cache and local variable existsRobert Maynard2018-07-101-26/+36
| | | | | | | | | | | | | | | | | | | | | | | | Previously we would warn when the local and cache version of a variable exists, but this use case doesn't need a warning as it maintains backwards compatibility.
* | | | CMake Nightly Date StampKitware Robot2018-07-121-1/+1
| | | |
* | | | Merge topic 'file-STRINGS-isprint'Brad King2018-07-111-2/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b872f5b303 file(STRINGS): Use isprint() to test character type Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2198
| * | | | file(STRINGS): Use isprint() to test character typeDevin Nakamura2018-07-101-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the more portable `isprint()` function to test characters rather than using hard-coded hex values. The function is documented by the C++ standard to return non-zero for the exact range of hex values we previously hard-coded, so this should not change behavior.
* | | | | Merge topic 'update-kwsys'Brad King2018-07-111-6/+10
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7c32432a80 Merge branch 'upstream-KWSys' into update-kwsys 3599b31474 KWSys 2018-07-10 (51982681) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2200
| * | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-07-101-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-07-10 (51982681)
* | | | | CMake Nightly Date StampKitware Robot2018-07-111-1/+1
| | | | |
* | | | | Merge topic 'vs-deployment-files'Brad King2018-07-101-29/+44
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3b2ea092ef Help: Add documentation for DEPLOYMENT_ADDITIONAL_FILES b771b2c300 VS: extended OutputDeploymentDebuggerTool for AdditionalFiles 2f4075fa45 VS: moved EscapeForXML function higher up and made static Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2184
| * | | | VS: extended OutputDeploymentDebuggerTool for AdditionalFilesFrank Goyens2018-07-091-18/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `OutputDeploymentDebuggerTool` function now also retrieves a target property that is used for setting the `AdditionalFiles` attribute of `DeploymentTool`.
| * | | | VS: moved EscapeForXML function higher up and made staticFrank Goyens2018-07-061-11/+12
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-07-101-1/+1
| |/ / / |/| | |
* | | | Merge topic 'option-normal-variable'Brad King2018-07-092-23/+47
|\ \ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 2a5f5c0e31 option: respect existing normal variable 12e6f83319 Option: Add a test that verifies interaction with normal variables 5bb3d40a28 cmOption: Remove VTK 4.0 workarounds Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2155
| * | | option: respect existing normal variableRobert Maynard2018-07-092-10/+46
| | | | | | | | | | | | | | | | Add policy CMP0077 to change this behavior in a compatible way.
| * | | cmOption: Remove VTK 4.0 workaroundsRobert Maynard2018-06-211-13/+1
| | | | | | | | | | | | | | | | | | | | CMake has no reason to have special logic to fix bad logic within VTK 4.0.
* | | | Merge topic 'csharp-link-file'Brad King2018-07-091-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a6107650e VS: Only link cs files when they're not in binary dir Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Stürmer <michael.stuermer@schaeffler.com> Merge-request: !2177