Jean-Christophe Fillion-Robin
33161f489c
FindQt4: Do not assume all libraries are frameworks
...
Since on MacOSX not all modules are available as "framework" (e.g libQtUiTools.a),
the assumption made in "FindQt4.cmake" is not always valid and systematically
setting the imported libraries location to framework location is incorrect.
This commit increases the robustness of the logic by first checking
if the location exists.
Fixes #17195
2017-08-21 16:18:49 -04:00
Brad King
23cf9e152f
InstallRequiredSystemLibraries: Find VS 2017 Update 3 redist directory
...
Add compiler version 19.11 to our table.
Fixes : #17184
2017-08-21 11:59:33 -04:00
Brad King
b45d8432c2
InstallRequiredSystemLibraries: Factor redist name into variable
...
Store the `VC###` component of the `Microsoft.VC###.CRT` directory name
in a variable set based on the toolchain version. Its naming convention
is changed by VS 15.3.
2017-08-21 11:59:31 -04:00
Craig Scott
9a0a6f91ae
Merge topic 'perf-targetIter-missedGenerators'
...
7bc65770
Performance: Fix a few more unnecessary vector copies missed in af3fd6f
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1157
2017-08-21 09:13:59 -04:00
Brad King
b14fdea3a6
Merge topic 'cpack-extend-test-capabilities'
...
80047bd6
CPack: extend testing framework
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1162
2017-08-21 09:03:00 -04:00
Brad King
ab5667b516
Merge topic 'autogen-macro-names'
...
b3d98c6e
Autogen: Add release notes for AUTOMOC_MACRO_NAMES
7529d84f
Autogen: Add documentation for AUTOMOC_MACRO_NAMES
05891d8f
Autogen: Add test for AUTOMOC_MACRO_NAMES
93f0ba28
Autogen: Add AUTOMOC_MACRO_NAMES support
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1156
2017-08-21 09:02:09 -04:00
Brad King
fabb217502
Merge topic 'bootstrap-target-commands'
...
ef978c1d
CursesDialog: use target_include_directories for cmForm
7814d750
bootstrap: make target_* commands available
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1158
2017-08-21 09:00:09 -04:00
Brad King
d46300be89
Merge topic 'vs-less-c_str'
...
79064819
VS: remove unnecessary c_str()
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1151
2017-08-21 08:58:39 -04:00
Brad King
037beeddd1
Merge topic 'findcuda_dont_quote_COMPILE_DEFINITIONS'
...
c1f4f13d
FindCUDA: Use long brackets to handle spaces in CUDA_NVCC_COMPILE_DEFINITIONS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1139
2017-08-21 08:56:56 -04:00
Brad King
e37cdb385a
Merge topic 'bootstrap'
...
d12837af
bootstrap: Require a standard C compiler
dc0befb6
bootstrap: Remove check that identifies GNU compiler
6fdcf02a
bootstrap: remove dead branches
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1142
2017-08-21 08:55:11 -04:00
Brad King
774d649126
Merge topic 'bootstrap-grep-solaris'
...
e488c7f9
bootstrap: Restore output redirection instead of "grep -q"
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1144
2017-08-21 08:51:06 -04:00
Brad King
c1f3eb9f2d
Merge topic 'require-c++11'
...
fd4fd9a2
Require C++11 to build CMake itself
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1132
2017-08-21 08:48:24 -04:00
Kitware Robot
a1b84ac2a6
CMake Nightly Date Stamp
2017-08-21 00:01:07 -04:00
Kitware Robot
4f9ce1aeca
CMake Nightly Date Stamp
2017-08-20 00:01:06 -04:00
Craig Scott
bb3647060c
Merge topic 'typo_doc_if_command'
...
b9ed29b7
Help: Fix formatting typo for the 'if' command
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1155
2017-08-19 17:15:41 -04:00
Domen Vrankar
80047bd611
CPack: extend testing framework
...
Some CPack tests require running
commands after the inclusion of
CPack.cmake and this patch enables
such tests to declare run_after_include_cpack
function which is run after the
inclusion.
2017-08-19 22:41:14 +02:00
Kitware Robot
4bf219a43f
CMake Nightly Date Stamp
2017-08-19 00:01:08 -04:00
Daniel Pfeifer
ef978c1dea
CursesDialog: use target_include_directories for cmForm
2017-08-18 22:25:20 +02:00
Daniel Pfeifer
7814d75023
bootstrap: make target_* commands available
2017-08-18 21:48:14 +02:00
Aaron Orenstein
7bc6577017
Performance: Fix a few more unnecessary vector copies missed in af3fd6f
2017-08-18 07:59:52 -07:00
Sebastian Holtermann
b3d98c6ec2
Autogen: Add release notes for AUTOMOC_MACRO_NAMES
2017-08-18 14:07:57 +02:00
Sebastian Holtermann
7529d84fac
Autogen: Add documentation for AUTOMOC_MACRO_NAMES
2017-08-18 13:58:14 +02:00
Sebastian Holtermann
05891d8f77
Autogen: Add test for AUTOMOC_MACRO_NAMES
2017-08-18 12:32:34 +02:00
Sebastian Holtermann
93f0ba2823
Autogen: Add AUTOMOC_MACRO_NAMES support
...
Closes #17176
2017-08-18 12:32:04 +02:00
Sylvain Joubert
b9ed29b7cb
Help: Fix formatting typo for the 'if' command
2017-08-18 09:43:40 +02:00
Kitware Robot
10edb0c7d5
CMake Nightly Date Stamp
2017-08-18 00:01:08 -04:00
Craig Scott
999192b0f7
Merge topic 'perf-targetIterAndLookup-cmLocalGenerator'
...
af3fd6f2
Performance: Add an index to Change cmLocalGenerator::GeneratorTargets.
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1136
2017-08-17 16:38:24 -04:00
Roger Leigh
d0a20d290c
FindIce: Add support for separate Freeze NuGet package
2017-08-17 20:59:09 +01:00
Konstantin Podsvirov
5fe64511d6
CPackIFW: Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable
...
Add CPACK_IFW_REPOSITORIES_DIRECTORIES variable to specify
additional repositories dirs that will be used to resolve and
repack dependent components
2017-08-17 21:41:16 +03:00
Vitaly Stakhovsky
79064819a6
VS: remove unnecessary c_str()
2017-08-17 14:41:01 -04:00
Kitware Robot
d3760354a5
CMake Nightly Date Stamp
2017-08-17 00:01:06 -04:00
Aaron Orenstein
af3fd6f22f
Performance: Add an index to Change cmLocalGenerator::GeneratorTargets.
...
Add an index to Change cmLocalGenerator::GeneratorTargets for faster lookup by
name.
Also changed a bunch of uses of cmLocalGenerator::GetGeneratorTargets() to take
const references instead of copying the vector.
Represent generator targets as a map (name -> target) to make name lookups more
efficient instead of looping through the entire vector to find the desired one.
2017-08-16 15:35:38 -07:00
Brad King
e488c7f9ee
bootstrap: Restore output redirection instead of "grep -q"
...
This reverts commit 567bac890c
(bootstrap: use "grep -q" instead of
output redirection, 2017-06-07). On Solaris `grep -q` does not exist.
2017-08-16 11:09:39 -04:00
Brad King
f59d8e5982
Merge topic 'CPackRPM-new-debuginfo'
...
48fa4c0d
CPackRPM: Restore old style debuginfo creation for rpm >= 4.14
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1099
2017-08-16 11:05:12 -04:00
Brad King
a2405b4378
Merge topic 'lint-fixes'
...
cbcf6458
cmServerProtocol: Do not move into json::Value::append()
91417e4c
cmServerProtocol: pass cmBacktraceRange by value
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1143
2017-08-16 10:51:48 -04:00
Brad King
d817bbb8df
Merge topic 'string_prepend'
...
d8ecc254
Add PREPEND sub-command to string command
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1129
2017-08-16 10:50:38 -04:00
Brad King
75b3866a8e
Merge topic 'ice-3.7.0'
...
5868be86
FindIce: Add support for Ice 3.7.0
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1137
2017-08-16 10:50:22 -04:00
Brad King
6ffb0f9d05
Merge branch 'release-3.9'
2017-08-16 10:48:20 -04:00
Brad King
b034e22f36
Merge topic 'FindCygwin-fix-regression'
...
a428b87c
Merge branch 'backport-FindCygwin-fix-regression' into FindCygwin-fix-regression
62930253
FindCygwin: Fix regression when CYGWIN_INSTALL_PATH is already set
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1128
2017-08-16 10:47:38 -04:00
Brad King
867b061153
Merge topic 'debian_clang_binutils'
...
630235bd
Clang: Find version-suffixed LLVM/Clang binutils
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1127
2017-08-16 10:47:10 -04:00
Brad King
472acc890f
Merge topic 'cuda-device-link-ccbin'
...
fe45d13a
CUDA: Pass host compiler to nvcc while device linking
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !1138
2017-08-16 10:46:42 -04:00
Brad King
1e77d0dbef
Merge topic 'autogen-autouic-lookup'
...
6c5e03d6
Merge branch 'backport-autogen-autouic-lookup' into autogen-autouic-lookup
fb5db079
Autogen: Extend AUTOUIC search paths test
d8a99dd2
Autogen: Update AUTOUIC documentation for search paths
02e6c548
Autogen: Restore AUTOUIC lookup paths from 3.8.2
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1140
2017-08-16 10:43:17 -04:00
Daniel Pfeifer
d12837afe6
bootstrap: Require a standard C compiler
2017-08-16 16:38:06 +02:00
Brad King
fd4fd9a276
Require C++11 to build CMake itself
...
CMake can now compile as C++11 on all supported platforms. Check that
std::unique_ptr is available and fail early if missing. This will allow
us to use C++11 more broadly in CMake's implementation (previously it
was restricted to the serve mode implementation).
Co-Author: Daniel Pfeifer <daniel@pfeifer-mail.de>
2017-08-16 10:13:38 -04:00
Björn Esser
48fa4c0d1a
CPackRPM: Restore old style debuginfo creation for rpm >= 4.14
2017-08-16 11:21:37 +02:00
Kitware Robot
131af5d591
CMake Nightly Date Stamp
2017-08-16 00:01:07 -04:00
Daniel Pfeifer
cbcf6458f4
cmServerProtocol: Do not move into json::Value::append()
...
CMake's copy of json-cpp is not aware of rvalues yet. It is confusing
to pass the result of std::move to a function that takes a const&
because no move will actually happen. This change may be reverted once
CMake upgrades to a new version of json-cpp.
2017-08-15 22:43:08 +02:00
Daniel Pfeifer
91417e4ca3
cmServerProtocol: pass cmBacktraceRange by value
2017-08-15 22:37:05 +02:00
Daniel Pfeifer
dc0befb6a1
bootstrap: Remove check that identifies GNU compiler
...
Bootstrapping no longer depends on this information.
2017-08-15 21:55:53 +02:00
Daniel Pfeifer
6fdcf02aaf
bootstrap: remove dead branches
...
Remove code that uses cmake_cxx_compiler_is_gnu before it is set.
2017-08-15 21:48:45 +02:00