Commit Graph

43228 Commits

Author SHA1 Message Date
Sebastian Holtermann
9794b72d38 cmWorkerPool: Set worker thread count separately to Process()
Don't pass the desired worker thread count to the `cmWorkerPool::Process()`
method but set it separately with the new `cmWorkerPool::SetThreadCount`
method.  This allows calling `cmWorkerPool::Process()` repeatedly without
having to pass the thread count every time.
2019-04-24 12:32:58 +02:00
Kitware Robot
993dfa89d8 CMake Nightly Date Stamp 2019-04-24 00:01:04 -04:00
Kitware Robot
d170a3177f CMake Nightly Date Stamp 2019-04-23 00:01:04 -04:00
Brad King
955f7f41c0 Merge branch 'release-3.14' 2019-04-22 09:22:04 -04:00
Brad King
800b2aad13 Merge topic 'sunpro-cxx14-features'
66f3f11af5 SunPro: Record support for C++14 features by SunPro 5.{14,15}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3248
2019-04-22 08:26:56 -04:00
Brad King
d0e3701861 Merge topic 'msvc-warning-flags'
1baf122cd4 MSVC: Do not add /W3 to CMAKE_<LANG>_FLAGS by default

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3250
2019-04-22 07:51:01 -04:00
Brad King
7700df9b1e CMake 3.14.3 v3.14.3 2019-04-22 07:42:52 -04:00
Brad King
246fdcc049 Merge branch 'release-3.14' 2019-04-22 07:40:45 -04:00
Brad King
637292a3a9 Merge topic 'findqt3-hints-fix'
c298c4553b FindQt3: Restore missing lib and bin path suffixes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3254
2019-04-22 07:39:34 -04:00
Brad King
cb23f2ac8b Merge topic 'vs-default-platform'
db02be85a0 VS: Provide the default platform name to project code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3246
2019-04-22 07:38:33 -04:00
Brad King
bc6f442b56 Merge branch 'findqt3-hints-fix' into release-3.14
Merge-request: !3254
2019-04-22 07:35:22 -04:00
Christian Pfeiffer
c298c4553b FindQt3: Restore missing lib and bin path suffixes
Restore path suffixes incorrectly removed by commit a62d50ec56 (Modules:
Replace coded PATHS with PATH_SUFFIXES, 2017-11-20, v3.11.0-rc1~293^2).
Hints do not participate in the usual bin/lib subdirectory search that
`<PackangeName>_ROOT` or `CMAKE_PREFIX_PATH` exhibit.

Fixes: #19185
2019-04-22 07:34:32 -04:00
Kitware Robot
8c322f9313 CMake Nightly Date Stamp 2019-04-22 00:01:04 -04:00
Kitware Robot
77ae6ae860 CMake Nightly Date Stamp 2019-04-21 00:01:03 -04:00
Kitware Robot
0116bb19d3 CMake Nightly Date Stamp 2019-04-20 00:01:04 -04:00
Brad King
1baf122cd4 MSVC: Do not add /W3 to CMAKE_<LANG>_FLAGS by default
We do not add default warning flags on other compilers, and having
a warning flag in the default flags makes it hard for projects to
customize the warning level.  They need to use string processing
to remove `/W3` from `CMAKE_{C,CXX}_FLAGS`.  Therefore we should
drop it.

However, projects may be using string processing to replace `/W3`
with another flag, so we cannot simply drop it.  Add a policy to
drop it in a compatible way.

Fixes: #18317
2019-04-19 12:56:49 -04:00
Brad King
66f3f11af5 SunPro: Record support for C++14 features by SunPro 5.{14,15}
SunPro 5.15 supports `-std=c++14` and several C++14 features.

SunPro 5.14 accepts `-std=c++14` but does not update its definition of
`__cplusplus` or any other macro to distinguish it from `-std=c++11`,
so we need to blacklist a couple features that do work but that we
cannot report for that version.  We can still support `cxx_std_14`.

Co-Author: Robert Maynard <robert.maynard@kitware.com>
2019-04-19 09:14:00 -04:00
Brad King
cb733eb4a6 Merge branch 'vs-default-platform' into release-3.14
Merge-request: !3246
2019-04-19 07:59:28 -04:00
Brad King
db02be85a0 VS: Provide the default platform name to project code
The value of `CMAKE_VS_PLATFORM_NAME` is computed by Visual Studio
generators based on `CMAKE_GENERATOR_PLATFORM` or some default.
Prior to the VS 2019 generator, the default was always `Win32`.
However, for the `Visual Studio 16 2019` generator, the default is
based on the host platform.

Store the default in a new `CMAKE_VS_PLATFORM_NAME_DEFAULT` variable for
use by project code.  This is particularly useful in toolchain files
because they are allowed to set `CMAKE_GENERATOR_PLATFORM` and so
`CMAKE_VS_PLATFORM_NAME` is not yet known.  Of course the toolchain file
author knows whether it will set `CMAKE_GENERATOR_PLATFORM`, and if not
then `CMAKE_VS_PLATFORM_NAME_DEFAULT` provides the platform name that
will be used.

Fixes: #19177
2019-04-19 07:46:13 -04:00
Brad King
8542152626 Merge topic 'test-find_package-resolve-symlinks'
a9428fc473 Tests: Fix FindPackageTest when path to source has a symlink
e27437d0e0 Tests/FindPackageTest: Tell Git to ignore temporary symlink path

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3244
2019-04-19 07:23:48 -04:00
Kitware Robot
bf64e50da4 CMake Nightly Date Stamp 2019-04-19 00:01:04 -04:00
Brad King
a9428fc473 Tests: Fix FindPackageTest when path to source has a symlink
Exclude a portion of the test that does not work in this case.
2019-04-18 16:01:33 -04:00
Brad King
e27437d0e0 Tests/FindPackageTest: Tell Git to ignore temporary symlink path 2019-04-18 16:00:50 -04:00
Brad King
2e94c1185b Merge topic 'unique'
9ecb3f8d5c Ninja,Makefile: use `unique_ptr` for memory management

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3230
2019-04-18 11:07:07 -04:00
Saleem Abdulrasool
9ecb3f8d5c Ninja,Makefile: use unique_ptr for memory management
Use a `unique_ptr` to manage the lifetime of the `MacOSXContentGenerator`
and 'OSXBundleGenerator` rather than manually handling the lifetime.
2019-04-18 11:05:25 -04:00
Brad King
a000ec7a08 Merge topic 'add_xl_cxx14_support'
458ea9d76c XL: Add C++14 language level flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3235
2019-04-18 11:03:12 -04:00
Brad King
52ef218664 Merge topic 'update-kwsys'
0e47391400 bootstrap: Update for new KWSys configuration option
fb15c27562 Merge branch 'upstream-KWSys' into update-kwsys
0225b05afe KWSys 2019-04-17 (c42b92f0)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3242
2019-04-18 11:01:50 -04:00
Kitware Robot
44c6acc053 CMake Nightly Date Stamp 2019-04-18 00:01:03 -04:00
Brad King
2ed688a863 Merge topic 'msvc-runtime-library'
fb3370b6a1 MSVC: Add abstraction for runtime library selection
f621e7fa5d VS: Fix Fortran runtime library flag map special case for '-' options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Acked-by: Leonid Pospelov <pospelovlm@yandex.ru>
Merge-request: !3211
2019-04-17 11:01:37 -04:00
Brad King
fb3370b6a1 MSVC: Add abstraction for runtime library selection
Replace our hard-coded defaults for `/MD` and `/MDd` with a first-class
abstraction to select the runtime library from an enumeration of logical
names.  We've long hesitated to do this because the idea of "runtime
library selection" touches on related concepts on several platforms.
Avoid that scope creep by simply defining an abstraction that applies
only when targeting the MSVC ABI on Windows.

Removing the old default flags requires a policy because existing
projects may rely on string processing to edit them and choose a runtime
library under the old behavior.  Add policy CMP0091 to provide
compatibility.

Fixes: #19108
2019-04-17 11:00:44 -04:00
Brad King
5cd187147e Merge topic 'memorize_msvc_like_compilers_C_support'
8e4899fd6c CompileFeatures: Record which C features the MSVC compiler supports

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3226
2019-04-17 10:58:49 -04:00
Brad King
0238295c7e Merge branch 'release-3.14' 2019-04-17 10:57:47 -04:00
Brad King
87609eebf3 Merge topic 'libglvnd-subdir'
844050adaf FindOpenGL: look for GLVND libraries with a libglvnd suffix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3236
2019-04-17 10:44:05 -04:00
Brad King
c648551bea Merge branch 'FindOpenGL-libglvnd-subdir' into release-3.14
Merge-request: !3236
2019-04-17 10:17:15 -04:00
Ben Boeckel
844050adaf FindOpenGL: look for GLVND libraries with a libglvnd suffix
On CentOS 6.10, the libglvnd package from EPEL installs its libraries
under a libglvnd subdirectory.
2019-04-17 10:16:46 -04:00
Brad King
0e47391400 bootstrap: Update for new KWSys configuration option 2019-04-17 10:13:19 -04:00
Brad King
fb15c27562 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2019-04-17 (c42b92f0)
2019-04-17 09:50:14 -04:00
KWSys Upstream
0225b05afe KWSys 2019-04-17 (c42b92f0)
Code extracted from:

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

at commit c42b92f0fe01cf588aacc1984501b4fdcc58994e (master).

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

Ben Boeckel (1):
      84bd7c9e SystemTools: support hiding the translation map

Sebastian Holtermann (8):
      00a3a436 SystemTools: Update buffered env value string only on a change
      d6235796 SystemTools: Optimize iterator lifetime in JoinPath
      9992f69b SystemTools: Optimize range loop in FindName method
      8c9ca162 SystemTools: Optimize range loop in FindProgram method
      c7e3ab12 SystemTools: Optimize range loop in FindProgram method
      ac8d2033 SystemTools: Optimize range loop in FindLibrary method
      815cc593 SystemTools: Optimize range loop in FindProgramPath method
      5d8af0d6 SystemTools: Optimize range loop in RelativePath method
2019-04-17 09:50:13 -04:00
Kitware Robot
8d5eb97878 CMake Nightly Date Stamp 2019-04-17 00:01:04 -04:00
Brad King
2d37678226 Merge topic 'vs-project-import'
d145d72e70 VS: add target property VS_PROJECT_IMPORT_<propspath>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3143
2019-04-16 13:43:52 -04:00
Brad King
9aecda56ba Merge topic 'genex-output_name'
60ec292258 Genex: Rename $<TARGET_*_OUTPUT_NAME:...> in $<TARGET_*_FILE_BASE_NAME:...>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3228
2019-04-16 13:42:53 -04:00
Brad King
3205561b8a Merge topic 'string-repeat'
536cca60ea string: introduce `REPEAT` sub-command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3239
2019-04-16 13:40:02 -04:00
Brad King
34975815a8 Merge topic 'autogen_moc_uic_single_job_queue'
58f04b6ecf Autogen: Add ManySources test
a3f062091f Autogen: Rename `cmQtAutoGeneratorMocUic` class to `cmQtAutoMocUic`
8cb26a0a2a Autogen: Factor out concurrency framework to cmWorkerPool class

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3224
2019-04-16 13:38:21 -04:00
Brad King
68a0b51ef8 Merge branch 'release-3.14' 2019-04-16 13:36:54 -04:00
Brad King
7f9e93aa05 Merge topic 'vs2019-redist'
a0b6448c85 IRSL: Update redist directory for VS 2019 update 1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3233
2019-04-16 13:35:39 -04:00
Brad King
fc4324a27c Merge topic 'Boost-Gentoo'
0b54f72e94 FindBoost: Fix detection with version suffixes on Gentoo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3237
2019-04-16 13:34:41 -04:00
Brad King
09fba6146f Merge branch 'Boost-Gentoo' into release-3.14
Merge-request: !3237
2019-04-16 13:34:03 -04:00
Rolf Eike Beer
0b54f72e94 FindBoost: Fix detection with version suffixes on Gentoo
The Gentoo case added by commit 1673923c30 (FindBoost: Add support for
Boost 1.67 with Python version suffixes, 2018-03-18, v3.11.0~3^2) left
out the `.` version component separator and instead duplicated the RPM
case.  Add the missing `.` now.

Fixes: #18743
2019-04-16 13:31:27 -04:00
Kitware Robot
5ec9d16b5a CMake Nightly Date Stamp 2019-04-16 00:01:04 -04:00
Leonid Pospelov
d145d72e70 VS: add target property VS_PROJECT_IMPORT_<propspath>
Fixes: #18998
2019-04-15 13:05:07 -04:00