Commit Graph

24839 Commits

Author SHA1 Message Date
Sylvain Joubert
22fbf39d9b CPack: Fix log typos (spaces in the wrong places) 2018-07-18 17:15:52 +02:00
Brad King
0ab23b9a1e Merge topic 'nvcc_dlink_dedup_static_libs'
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
2018-07-18 09:07:53 -04:00
Kitware Robot
5d550b2772 CMake Nightly Date Stamp 2018-07-18 00:01:05 -04:00
Robert Maynard
fd0523a215 CUDA: Properly de-duplicate libs when doing device linking
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.
2018-07-17 10:42:57 -04:00
Brad King
7ebc06fb02 Merge topic 'math-err'
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
2018-07-17 07:14:48 -04:00
Brad King
e08f02b928 Merge topic 'hex_file'
5f431789a9 Use isxdigit() to determine if a character is a hex digit

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2213
2018-07-17 07:12:29 -04:00
Kitware Robot
328410f26b CMake Nightly Date Stamp 2018-07-17 00:01:08 -04:00
Brad King
406f397e8b math: Restore toleration of unexpected characters in an expression
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.
2018-07-16 14:46:43 -04:00
Brad King
dd5c54600b cmExprParserHelper: Simplify error state tracking
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.
2018-07-16 13:04:06 -04:00
Brad King
185bcface4 cmExprParserHelper: Remove some unused code 2018-07-16 11:12:34 -04:00
Kitware Robot
992e9d10f8 CMake Nightly Date Stamp 2018-07-16 00:01:04 -04:00
Kitware Robot
1a1eeda75a CMake Nightly Date Stamp 2018-07-15 00:01:05 -04:00
Kitware Robot
c960907105 CMake Nightly Date Stamp 2018-07-14 00:01:13 -04:00
Devin Nakamura
5f431789a9 Use isxdigit() to determine if a character is a hex digit
Replace custom cm_IsHexChar with isxdigit from the stdlib
2018-07-13 13:55:39 -04:00
Brad King
102f51d0aa Merge topic 'autogen_forward_errors'
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
2018-07-13 08:57:36 -04:00
Brad King
f691dbc485 Merge topic 'cpack-wix-extra-sources'
f2134169f6 WiX: Add the build directory to IncludeSearchPaths for candle.exe

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2194
2018-07-13 08:57:09 -04:00
Brad King
00afb11b07 Merge topic 'update-kwsys'
c5a1491e90 Merge branch 'upstream-KWSys' into update-kwsys
c454a1435a KWSys 2018-07-12 (86ce4f37)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2211
2018-07-13 08:53:21 -04:00
Kitware Robot
4d9d674cf2 CMake Nightly Date Stamp 2018-07-13 00:01:06 -04:00
Brad King
f6f5f9f75f Merge topic 'ghs'
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
2018-07-12 09:15:18 -04:00
Brad King
7b04ad61cf Merge topic 'option_respects_existing_stack_variable'
f8a7cf85ad option: No CMP077 warnings when both cache and local variable exists

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2203
2018-07-12 09:12:26 -04:00
Brad King
c5a1491e90 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-07-12 (86ce4f37)
2018-07-12 08:47:15 -04:00
Lars Schmertmann
f2134169f6 WiX: Add the build directory to IncludeSearchPaths for candle.exe
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.
2018-07-12 08:48:33 +02:00
Kitware Robot
05cd8311ab CMake Nightly Date Stamp 2018-07-12 00:01:05 -04:00
Sebastian Holtermann
86b332c25d Return std::string from cmGeneratorTarget::ImportedGetLocation 2018-07-11 16:58:48 +02:00
Fred Baksik
281c601024 GHS: Update default BSP name
-- 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
2018-07-11 08:48:23 -04:00
Fred Baksik
bb77dc0cee GHS: Set primary target using arch/platform values (or user specified value) 2018-07-11 08:44:49 -04:00
Fred Baksik
f80692cf60 GHS: Add platform selection support 2018-07-11 08:33:21 -04:00
Fred Baksik
a37a4a00c8 GHS: Add toolset selection support
-- 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
2018-07-11 08:28:36 -04:00
Sebastian Holtermann
189f723509 Autogen: Wrap moc/uic/rcc related variables in structs 2018-07-11 13:54:46 +02:00
Sebastian Holtermann
c6a8002827 Autogen: Improve error detection during configuration
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.
2018-07-11 13:29:49 +02:00
Brad King
f2c651aec9 Merge topic 'file-STRINGS-isprint'
b872f5b303 file(STRINGS): Use isprint() to test character type

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2198
2018-07-11 07:22:35 -04:00
Brad King
7eb701d98b Merge topic 'update-kwsys'
7c32432a80 Merge branch 'upstream-KWSys' into update-kwsys
3599b31474 KWSys 2018-07-10 (51982681)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2200
2018-07-11 07:21:37 -04:00
Kitware Robot
0723eada4d CMake Nightly Date Stamp 2018-07-11 00:01:06 -04:00
Devin Nakamura
b872f5b303 file(STRINGS): Use isprint() to test character type
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.
2018-07-10 13:57:07 -04:00
Robert Maynard
f8a7cf85ad option: No CMP077 warnings when both cache and local variable exists
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.
2018-07-10 13:56:15 -04:00
Brad King
5f7886c52b Merge topic 'vs-deployment-files'
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
2018-07-10 10:06:07 -04:00
Brad King
7c32432a80 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2018-07-10 (51982681)
2018-07-10 08:46:37 -04:00
Kitware Robot
be69317b97 CMake Nightly Date Stamp 2018-07-10 00:01:07 -04:00
Brad King
c878e6f8cc Merge topic 'option-normal-variable'
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
2018-07-09 10:25:33 -04:00
Robert Maynard
2a5f5c0e31 option: respect existing normal variable
Add policy CMP0077 to change this behavior in a compatible way.
2018-07-09 07:48:28 -04:00
Frank Goyens
b771b2c300 VS: extended OutputDeploymentDebuggerTool for AdditionalFiles
The `OutputDeploymentDebuggerTool` function now also retrieves a target
property that is used for setting the `AdditionalFiles` attribute of
`DeploymentTool`.
2018-07-09 07:39:39 -04:00
Brad King
ed75309344 Merge topic 'csharp-link-file'
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
2018-07-09 07:33:35 -04:00
Kitware Robot
0100e5b2a7 CMake Nightly Date Stamp 2018-07-09 00:01:04 -04:00
Kitware Robot
e3ade3cc72 CMake Nightly Date Stamp 2018-07-08 00:01:06 -04:00
Fred Baksik
5d40d2b44f GHS: Support ARM, PPC, 86 architectures
-- 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
2018-07-07 07:27:21 -04:00
Kitware Robot
c29dda6c99 CMake Nightly Date Stamp 2018-07-07 00:01:10 -04:00
Frank Goyens
2f4075fa45 VS: moved EscapeForXML function higher up and made static 2018-07-06 11:30:23 -04:00
Robert Dailey
8a6107650e VS: Only link cs files when they're not in binary dir
When `*.cs` files are provided, do not generate a `<Link>` element in
the `.csproj` project if those files are descendants of
`CMAKE_CURRENT_BINARY_DIR`. This comparison happens for each file.
2018-07-06 09:45:15 -04:00
Brad King
9d1bc0a918 Merge topic 'list-command-insert'
a08154d493 list: Allow inserting at the end of a list

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2181
2018-07-06 09:41:24 -04:00
Kitware Robot
f6b20179aa CMake Nightly Date Stamp 2018-07-06 00:01:08 -04:00