GitLab

Brad King authored Jul 16, 2018 and Kitware Robot committed Jul 16, 2018

62b4df1e

 Help: Mention IMPORTED_OBJECTS in add_library docs
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2216

Brad King authored Jul 16, 2018 and Kitware Robot committed Jul 16, 2018

82f39c9c

 FindXercesC: Search for version-named library files
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Roger Leigh <rleigh@codelibre.net>
Merge-request: !2210

Merge-request: !2216

The `IMPORTED_OBJECTS` is to object libraries as `IMPORTED_LOCATION`
is to normal libraries.

Fixes: #18176

Raul Metsma authored Jul 11, 2018 and Brad King committed Jul 13, 2018

Use the version number extracted from the header file to construct
versioned library names.  This approach is already used by `FindXalanC`.
Signed-off-by: Raul Metsma <raul@metsma.ee>

Brad King authored Jul 13, 2018 and Kitware Robot committed Jul 13, 2018

86b332c2 Return std::string from cmGeneratorTarget::ImportedGetLocation
189f7235 Autogen: Wrap moc/uic/rcc related variables in structs
c6a80028

 Autogen: Improve error detection during configuration
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2207

Brad King authored Jul 13, 2018 and Kitware Robot committed Jul 13, 2018

f2134169

 WiX: Add the build directory to IncludeSearchPaths for candle.exe
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2194

Brad King authored Jul 13, 2018 and Kitware Robot committed Jul 13, 2018

735e69f4

 Intel: Fix incorrectly documented extension flags
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2206

Brad King authored Jul 13, 2018 and Kitware Robot committed Jul 13, 2018

b76b93c7 FindBoost: Change context header used
c8a7835e

 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

Brad King authored Jul 13, 2018 and Kitware Robot committed Jul 13, 2018

c5a1491e Merge branch 'upstream-KWSys' into update-kwsys
c454a143

 KWSys 2018-07-12 (86ce4f37)
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2211

Merge-request: !2206

Christian Pfeiffer authored Jul 11, 2018 and Brad King committed Jul 12, 2018

Fixes: #18166

Brad King authored Jul 12, 2018 and Kitware Robot committed Jul 12, 2018

e014df76

 QNX: Fix autogen compiler predefines detection
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2205

Brad King authored Jul 12, 2018 and Kitware Robot committed Jul 12, 2018

ce4f20ba GHS: Add release notes
281c6010 GHS: Update default BSP name
01c98c6c GHS: Update setting default OS location for Integrity platforms
bb77dc0c GHS: Set primary target using arch/platform values (or user specified value)
f80692cf GHS: Add platform selection support
a37a4a00 GHS: Add toolset selection support
5d40d2b4

 GHS: Support ARM, PPC, 86 architectures
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Matt Soucy <matthew.soucy@baesystems.com>
Merge-request: !798

Brad King authored Jul 12, 2018 and Kitware Robot committed Jul 12, 2018

f8a7cf85

 option: No CMP077 warnings when both cache and local variable exists
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2203

Merge-request: !2204

* upstream-KWSys:
  KWSys 2018-07-12 (86ce4f37)

Kitware Robot authored Jul 12, 2018 and Brad King committed Jul 12, 2018

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

Merge-request: !2205

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.

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).

Cristian Adam authored Jul 11, 2018 and Brad King committed Jul 11, 2018

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.

-- 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

-- 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)

-- 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

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.