Commit Graph

40082 Commits

Author SHA1 Message Date
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 969ad5b33e Merge branch 'release-3.12' 2018-07-13 08:55:33 -04:00
Brad King 0d72c50d29 Merge topic 'intel-std-fix'
735e69f445 Intel: Fix incorrectly documented extension flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2206
2018-07-13 08:54:47 -04:00
Brad King 718d2f8f16 Merge topic 'boost-1.68-beta1'
b76b93c728 FindBoost: Change context header used
c8a7835ea9 FindBoost: Add support for Boost 1.68 beta1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Grund <github@grundis.de>
Merge-request: !2204
2018-07-13 08:54:16 -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 bfb025f04b Merge branch 'release-3.12' 2018-07-12 09:37:36 -04:00
Brad King e109dc0b2a Merge branch 'intel-std-fix' into release-3.12
Merge-request: !2206
2018-07-12 09:36:30 -04:00
Christian Pfeiffer 735e69f445 Intel: Fix incorrectly documented extension flags
Fixes: #18166
2018-07-12 09:35:50 -04:00
Brad King f7f2b8078e Merge topic 'qnx_fix'
e014df762b QNX: Fix autogen compiler predefines detection

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2205
2018-07-12 09:15:58 -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 384c3f9e9e Merge branch 'boost-1.68-beta1' into release-3.12
Merge-request: !2204
2018-07-12 09:10:02 -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
KWSys Upstream c454a1435a KWSys 2018-07-12 (86ce4f37)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 86ce4f37437685728662ab6edcf8cf7b6154d649 (master).

Upstream Shortlog
-----------------

Devin Nakamura (1):
      2cbf13d2 Terminal: Add support for z/OS terminal
2018-07-12 08:47:14 -04:00
Brad King 730c8b8727 Merge branch 'qnx_fix' into release-3.12
Merge-request: !2205
2018-07-12 08:41:20 -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
Roger Leigh b76b93c728 FindBoost: Change context header used
boost/context/all.hpp is removed in Boost 1.68.
boost/context/detail/fcontext.hpp is present in all Boost
releases containing context (≥1.61).
2018-07-11 23:14:21 +01:00
Cristian Adam e014df762b QNX: Fix autogen compiler predefines detection
In commit v3.12.0-rc1~20^2 (Move GNU COMPILER_PREDEFINES_COMMAND from
Platform to Compiler, 2018-06-01), `Compiler/GNU.cmake` introduced the
`-dM` flag, which requires `-Wp` prefix for the QNX compiler wrapper.
2018-07-11 09:54:49 -04:00
Fred Baksik ce4f20ba62 GHS: Add release notes 2018-07-11 08:48:25 -04: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 01c98c6ccc GHS: Update setting default OS location for Integrity platforms
-- Update how the latest OS is determined; scan the location GHS_OS_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
   Filter out files from the list of directories (i.e if int1234.zip and int1234 are both in root folder)
2018-07-11 08:46:26 -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
Roger Leigh c8a7835ea9 FindBoost: Add support for Boost 1.68 beta1
This includes a new component, `Boost::contract`.

Fixes: #18167
2018-07-11 07:26:51 -04: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 cd7fad9cf3 Merge topic 'implicit-link-CMP0054'
a353d10a75 Protect implicit link library extraction with policy CMP0054

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2201
2018-07-11 07:22:05 -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 500dac1f25 Merge branch 'release-3.12' 2018-07-10 11:06:05 -04:00
Brad King 5467579828 Merge topic 'document_object_library_as_a_property_type'
741fd1c773 Help: Add OBJECT_LIBRARY to TYPE target property documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2199
2018-07-10 11:05:13 -04:00
Brad King f974000d93 Merge branch 'document_object_library_as_a_property_type' into release-3.12
Merge-request: !2199
2018-07-10 10:09:10 -04:00
Robert Maynard 741fd1c773 Help: Add OBJECT_LIBRARY to TYPE target property documentation 2018-07-10 10:08:45 -04:00
Brad King d73ad4ed8b Merge topic 'skip_mfc_test'
eb2ee1dc7e Tests: skip MFC test when building cmake when no file association for vcproj

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2196
2018-07-10 10:07:39 -04:00
Brad King c481294508 Merge topic 'uwp'
de5a4653d7 Add WindowsPhone and WindowsStore platform modules for Clang/GNU C/CXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2197
2018-07-10 10:06:53 -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 a353d10a75 Protect implicit link library extraction with policy CMP0054
CMakeParseImplicitLinkInfo tests arbitrary content with `if(MATCHES)`.
Set policy CMP0054 to ensure the line content is never interpreted as a
variable reference (which may also produce a CMP0054 warning).

While at it, also set policy CMP0053 to improve performance.
2018-07-10 09:31:24 -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
KWSys Upstream 3599b31474 KWSys 2018-07-10 (51982681)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit 5198268138295f67c567c04f4cb0c0f3fdfebef4 (master).

Upstream Shortlog
-----------------

Brad King (1):
      aebe4597 XL: Restore suppression of infinite loop warning in process test
2018-07-10 08:46:35 -04:00
Kitware Robot be69317b97 CMake Nightly Date Stamp 2018-07-10 00:01:07 -04:00
Fred Baksik eb2ee1dc7e Tests: skip MFC test when building cmake when no file association for vcproj 2018-07-09 11:29:54 -04:00
Brad King 8d478c0003 Merge topic 'emacs-fix-unescaped-character-literals'
67ae6da331 cmake-mode.el: Fix "unescaped character literals" warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2195
2018-07-09 10:26:40 -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
Jeff Kowalski 67ae6da331 cmake-mode.el: Fix "unescaped character literals" warning
Emacs 27.0 warns

    Loading ‘cmake-mode’: unescaped character literals `?(', `?)' detected!

during byte-compilation of cmake-mode.el The new warning was added in
emacs commit c2bbdc3316 (Warn about missing backslashes during load).

Add backslashes to escape the literals.
2018-07-09 10:06:33 -04:00
Brad King 1b5b1dc5cc Merge branch 'release-3.12' 2018-07-09 09:30:54 -04:00
Brad King 7f1569d2d8 CMake 3.12.0-rc3 v3.12.0-rc3 2018-07-09 08:06:27 -04:00