mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-20 05:12:07 -05:00
Code Issues Packages Projects Releases Wiki Activity
38,069 Commits 2 Branches 396 Tags
0c1912e3e58bebe9eb7c6dcac7a478dc607dba66
Commit Graph

38069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
0c1912e3e5 Merge topic 'serverFixTestDiscovery' 
fe2c2b0f server: ctestInfo fix to return all tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1479
 2017-11-27 08:51:35 -05:00
Kitware Robot
b1d3fb7fba CMake Nightly Date Stamp 2017-11-27 00:01:15 -05:00
Kitware Robot
53c6da8b9e CMake Nightly Date Stamp 2017-11-26 00:01:10 -05:00
Kitware Robot
c55fe43fc1 CMake Nightly Date Stamp 2017-11-25 00:01:04 -05:00
Kitware Robot
eea976e930 CMake Nightly Date Stamp 2017-11-24 00:01:22 -05:00
Kitware Robot
e1243a50a7 CMake Nightly Date Stamp 2017-11-23 00:01:05 -05:00
Craig Scott
51ccfaacb8 Merge topic 'WriteBasicConfigVersionFile_SameMinorVersion' 
d18ff3a5 WriteBasicConfigVersionFile: Fix messages in ExactVersion tests
16a93de0 WriteBasicConfigVersionFile: Add SameMinorVersion COMPATIBILITY option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Claudio <claudio.fantacci@gmail.com>
Merge-request: !1507
 2017-11-22 07:29:33 -05:00
Kitware Robot
7dbeb3ac5c CMake Nightly Date Stamp 2017-11-22 00:02:20 -05:00
Brad King
baa19f658f Merge topic 'gtest-fix-discovery' 
70f9f62d GoogleTest: Fix multiple discovery on same target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1510
 2017-11-21 13:00:24 -05:00
Matthew Woehlke
70f9f62da8 GoogleTest: Fix multiple discovery on same target 
According to the documentation, tests can be discovered for a target
multiple times by using a different prefix and/or suffix to ensure name
uniqueness. However, while this worked for gtest_add_tests, it did not
work with gtest_discover_tests because the generated file that sets up
the tests was named based only on the target name, and so subsequent
discovery from the same target would clobber earlier discovery.

Fix this by introducing a counter that records how many times discovery
has been used on a target, and use this to generate unique names of the
generated test list files.
 2017-11-21 12:05:34 -05:00
Christian Pfeiffer
daeadde888 Merge topic 'irsl-intel-1041-folder' 
8e7e7af5 IRSL: Install the 1041 folder for Intel compilers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1509
 2017-11-21 05:56:03 -05:00
Christian Pfeiffer
65c5833858 Merge topic 'findqt4-dirs-fix' 
f81d186b FindQt4: Set PLUGINS and IMPORTS dir even if empty

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1503
 2017-11-21 05:55:40 -05:00
Christian Pfeiffer
8f8f118327 Merge topic 'wxwidgets-env-variables' 
9b503cc8 wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1504
 2017-11-21 05:55:12 -05:00
Christian Pfeiffer
e91e69cfb5 Merge topic 'imagemagick-6-freebsd-names' 
35b8a26b FindImageMagick: Add more library names

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1505
 2017-11-21 05:54:50 -05:00
Daniele E. Domenichelli
d18ff3a5c6 WriteBasicConfigVersionFile: Fix messages in ExactVersion tests 2017-11-21 10:09:15 +01:00
Daniele E. Domenichelli
16a93de0a8 WriteBasicConfigVersionFile: Add SameMinorVersion COMPATIBILITY option 2017-11-21 09:27:07 +01:00
Kitware Robot
9698eef88a CMake Nightly Date Stamp 2017-11-21 00:01:05 -05:00
Brad King
4d52b46c70 Merge topic 'tidy-sha1-comment' 
08353542 clang-tidy: Clarify comment explaining purpose of CLANG_TIDY_SHA1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1497
 2017-11-20 13:37:50 -05:00
Brad King
7ec847395d Merge branch 'release-3.10' 2017-11-20 11:23:49 -05:00
Christian Pfeiffer
8e7e7af5c8 IRSL: Install the 1041 folder for Intel compilers 
The presence of the `1041` seems to solely depend on whether a given
Intel compiler release was available in Japanese or not. Install it if
it is present and silently ignore it otherwise.

Example: The Intel 2018.0 release did not ship it, but the 2018.1
compilers have it.
 2017-11-20 16:35:02 +01:00
Brad King
7746fdb2fe CMake 3.10.0 v3.10.0 2017-11-20 10:27:59 -05:00
Brad King
c7f175d637 Merge branch 'release-3.10' 2017-11-20 10:26:01 -05:00
Brad King
d5624a40f2 Merge topic 'fix-cmake-server-bad-buffering' 
01c42155 server: Fix regression in partial message handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Reviewed-by: jdavidberger <j.david.berger@gmail.com>
Merge-request: !1498
 2017-11-20 10:23:48 -05:00
Brad King
08ce62bee5 Merge topic 'autogen-rcc-custom-command' 
40434631 Autogen: Use integers instead of strings for the Qt version
be11a852 Autogen: Use project relative paths in rcc custom command comment
ab9d5896 Autogen: Detect rcc feature once during configuration
2a85b5ac Autogen: Make cmQtAutoGeneratorInitializer an instantiable class
75819b86 Autogen: Add and use cmQtAutoGenerator base class
27ed3b35 Autogen: Rename cmQtAutoGenerators to cmQtAutoGeneratorMocUic
1cd285fe Autogen: Remove rcc code from cmQtAutoGenerators
a87f82e0 Autogen: Switch to use custom commands for RCC
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1494
 2017-11-20 10:13:11 -05:00
Brad King
66b37132b6 Merge topic 'cpack-minor-cleanup-and-tests-extension' 
325f34d1 CPack tests: add possibility for expecting config developer warnings
176281e1 CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIX
cf0c2599 CPack: set variable commands in lower case
2ff906b3 CPack: documentation typo fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1499
 2017-11-20 10:09:14 -05:00
Brad King
345ae8d0e1 Merge topic 'ctest-chrono' 
5fd979a8 CTest: adopt std::chrono::system_clock

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1487
 2017-11-20 09:50:02 -05:00
Brad King
1da5a6ea39 Merge topic 'cuda-sep-comp-var' 
00e13993 CUDA: Add CMAKE_CUDA_SEPARABLE_COMPILATION variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alexander Korsunsky <a.korsunsky@gmail.com>
Merge-request: !1495
 2017-11-20 09:45:58 -05:00
Brad King
967ba2e180 Merge topic 'iwyu-suppress-clang-warnings' 
be592b23 IWYU: Suppress warnings from the internal Clang

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1496
 2017-11-20 09:44:48 -05:00
Brad King
dc24013bfc Merge topic 'perf-source-lookup' 
4a6348db Performance: Improve efficiency of source file lookup in cmMakefile

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1421
 2017-11-20 09:44:19 -05:00
Brad King
9100ea1d82 Merge topic 'FindOpenGL-glvnd-policy' 
2ea17412 FindOpenGL: Add policy CMP0072 to prefer GLVND for legacy GL

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Clinton Stimpson <clinton@elemtech.com>
Merge-request: !1491
 2017-11-20 09:43:27 -05:00
Brad King
b0c2cd47f0 Merge topic 'serverBugFixHasInstallRule' 
cb7d0a80 server: project has install rule bug fix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1489
 2017-11-20 09:42:06 -05:00
Brad King
521cb89e02 Merge topic 'vs-source-group-order' 
f26009dd VS: Order .vcxproj.filters files deterministically
c871446a cmSourceGroup: Return strings from GetName and GetFullName

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1484
 2017-11-20 09:41:09 -05:00
Brad King
a347de186c Merge branch 'fix-cmake-server-bad-buffering' into release-3.10 
Merge-request: !1498
 2017-11-20 09:30:04 -05:00
vector-of-bool
01c42155cc server: Fix regression in partial message handling 
If a partial message is flushed into the input pipe for CMake Server,
the parser will try and parse it as a full message because of some bad
loop checks.  This was introduced accidentally in commit
v3.10.0-rc1~365^2~2 (server: Refactor to make the event loop owned by
server object, 2017-03-24).
 2017-11-20 09:25:20 -05:00
Christian Pfeiffer
35b8a26be1 FindImageMagick: Add more library names 
The port maintainers on FreeBSD normalize the library names to not
include the bit and HDRI options.

Furthermore, `--quantum-depth=32` and `--quantum-depth=64` will yield
`Q32` and `Q64` suffixes in the library names.

Issue: #17492
 2017-11-20 14:44:54 +01:00
Craig Scott
a4fd74b90a Merge topic 'compile_flags_xref_fix' 
87a0b54a Help: Fix cross-reference in COMPILE_FLAGS target property docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1500
 2017-11-20 06:08:06 -05:00
Kitware Robot
566f77b7f9 CMake Nightly Date Stamp 2017-11-20 00:01:04 -05:00
Christian Pfeiffer
9b503cc86e wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars 
Issue: #17492
 2017-11-19 23:05:31 +01:00
Christian Pfeiffer
f81d186b15 FindQt4: Set PLUGINS and IMPORTS dir even if empty 
Fixes: #14155
Issue: #17492
 2017-11-19 22:54:24 +01:00
Domen Vrankar
325f34d150 CPack tests: add possibility for expecting config developer warnings 2017-11-19 14:55:00 +01:00
Domen Vrankar
176281e131 CPack test: correctly handle CPACK_PACKAGING_INSTALL_PREFIX 
Every CPack generator sets default CPACK_PACKAGING_INSTALL_PREFIX
variable value differently so test framework should support
that correctly - previous version expected RPM/Deb /usr default and
removed it for Archive packagers as the default there is /.
 2017-11-19 14:55:00 +01:00
Domen Vrankar
cf0c25995d CPack: set variable commands in lower case 2017-11-19 14:55:00 +01:00
Domen Vrankar
2ff906b34e CPack: documentation typo fix 2017-11-19 14:55:00 +01:00
Sebastian Holtermann
4043463179 Autogen: Use integers instead of strings for the Qt version 2017-11-19 13:35:07 +01:00
Sebastian Holtermann
be11a85286 Autogen: Use project relative paths in rcc custom command comment 2017-11-19 13:35:07 +01:00
Sebastian Holtermann
ab9d5896ae Autogen: Detect rcc feature once during configuration 
We used to detect the `rcc` features before every `rcc` list invocation
wich resulted in `rcc` be called twice for every listing operation.

Now we detect the `rcc` list capabilities once during configuration and
pass it to the cmake_autorcc target in the info file.
 2017-11-19 13:12:42 +01:00
Sebastian Holtermann
2a85b5ac76 Autogen: Make cmQtAutoGeneratorInitializer an instantiable class 
Remove the cmQtAutoGenDigest classes and make
cmQtAutoGeneratorInitializer instantiable instead.
 2017-11-19 12:51:31 +01:00
Sebastian Holtermann
75819b8626 Autogen: Add and use cmQtAutoGenerator base class 
Adds the new base class `cmQtAutoGenerator` which contains common
variables and methods used by `cmQtAutoGeneratorMocUic` and
`cmQtAutoGeneratorRcc`.
 2017-11-19 12:51:31 +01:00
Sebastian Holtermann
27ed3b3537 Autogen: Rename cmQtAutoGenerators to cmQtAutoGeneratorMocUic 2017-11-19 12:51:30 +01:00
Sebastian Holtermann
1cd285fe06 Autogen: Remove rcc code from cmQtAutoGenerators 2017-11-19 12:51:30 +01:00