summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* GoogleTest: Improve gtest_discover_tests messagesMatthew Woehlke2017-11-301-3/+7
| | | | | Adjust the formatting of error messages produced when test discovery goes wrong, in order to avoid spurious line breaking.
* Merge branch 'gtest-fix-discovery' into release-3.10Brad King2017-11-215-5/+67
|\ | | | | | | Merge-request: !1510
| * GoogleTest: Fix multiple discovery on same targetMatthew Woehlke2017-11-215-5/+67
|/ | | | | | | | | | | | | 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.
* CMake 3.10.0v3.10.0Brad King2017-11-201-1/+1
|
* Merge branch 'fix-cmake-server-bad-buffering' into release-3.10Brad King2017-11-201-3/+2
|\ | | | | | | Merge-request: !1498
| * server: Fix regression in partial message handlingvector-of-bool2017-11-201-3/+2
| | | | | | | | | | | | | | | | 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).
* | Merge branch 'FindOpenGL-glvnd-preference' into release-3.10Brad King2017-11-151-13/+57
|\ \ | | | | | | | | | Merge-request: !1485
| * | FindOpenGL: Add option to prefer GLVND for legacy GLBrad King2017-11-151-13/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.10.0-rc5~3^2 (FindOpenGL: Default to non-GLVND libraries for legacy GL, 2017-11-08) users may set `OPENGL_gl_LIBRARY` to empty to use GLVND components for the legacy GL interfaces. This is useful only when one knows in advance that the GLVND components will be found. Add a `OpenGL_GL_PREFERENCE` variable to specify a preference for legacy GL or GLVND. The latter can suppress `OPENGL_gl_LIBRARY` only when the needed GLVND components are found. If no preference is explicitly specified, choose a default based on whether GLVND components were requested (because this indicates the project has been updated for CMake 3.10). Issue: #17437 Issue: #17449
| * | FindOpenGL: Re-order component library searchesBrad King2017-11-151-7/+8
| |/ | | | | | | | | Move the search for the legacy GL library to after the GLVND libraries. For now we still always look for both.
* | Merge branch 'cmake-gui-qt-static-windows' into release-3.10Brad King2017-11-143-5/+23
|\ \ | |/ |/| | | Merge-request: !1476
| * Tests: Add options to disable tests requiring QtBrad King2017-11-131-4/+12
| |
| * cmake-gui: Add build option to use Qt5 windows plugin staticallyBrad King2017-11-132-1/+11
|/ | | | This will enable builds against a static Qt5 on Windows.
* CMake 3.10.0-rc5v3.10.0-rc5Brad King2017-11-101-1/+1
|
* Merge branch 'windows-mt-update-quiet' into release-3.10Brad King2017-11-101-14/+23
|\ | | | | | | | | Merge-request: !1470 Merge-request: !1473
| * Windows: Do not report manifest tool update notification as failureBrad King2017-11-101-14/+23
| | | | | | | | | | | | | | | | | | A diagnostic message added in commit v3.10.0-rc1~59^2 (Windows: Improve link-time error messages when rc or mt fail, 2017-09-22) incorrectly reports the `mt /notify_update` special return code as a failure. Fix the logic to consider the special return codes as success. Fixes: #17444
* | Merge branch 'doxygen_dot' into release-3.10Brad King2017-11-101-1/+5
|\ \ | | | | | | | | | Merge-request: !1472
| * | FindDoxygen: Fix setting of HAVE_DOT in non-backward-compat modeAndré Apitzsch2017-11-101-1/+5
| |/ | | | | | | | | | | `DOXYGEN_DOT_FOUND` is only set if `_Doxygen_keep_backward_compat` is used (when no components are requested), so use `Doxygen_dot_FOUND` directly. Preserve the "YES" or "NO" value used previously.
* | Merge branch 'FindOpenGL-no-glvnd-for-GL' into release-3.10Brad King2017-11-091-20/+24
|\ \ | | | | | | | | | Merge-request: !1466
| * | FindOpenGL: Default to non-GLVND libraries for legacy GLBrad King2017-11-091-20/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Projects using `OPENGL_LIBRARIES` or `OpenGL::GL` expect legacy GL. Although GLVND OpenGL+GLX provides legacy GL interfaces, using those library files may conflict with legacy GL library files used by dependencies (or dependents) of such projects. Therefore we should not yet use OpenGL+GLX when a legacy GL library is available. If `OPENGL_gl_LIBRARY` is set then use it as the legacy GL library. If it is *not* set then fall back to using GLVND OpenGL+GLX to provide legacy GL interfaces. This will allow users to build projects using GLVND even if they have not been ported. Fixes: #17437
* | | Merge branch 'FindHDF5-c-version' into release-3.10Brad King2017-11-081-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !1465
| * | | FindHDF5: Fix H5_VERSION on Patch in CAxel Huebl2017-11-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a typo from commit v3.6.0-rc1~85^2 (HDF5: Refactor the use of compiler wrappers, 2016-04-04) that accidentally used the HDF5 C++ version (which could be empty) while detecting the C patch version. The detection failed for patch releases, such as `1.10.0-patch1` becoming `.1` instead of `1.10.0.1`.
* | | | Merge branch 'implicit-lib-gcceh' into release-3.10Brad King2017-11-082-2/+22
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1460
| * | | | Restore exclusion of "gcc_eh" from implicit link librariesChristian Pfeiffer2017-11-082-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc1~148^2 (Do not assume GCC libs are linked by all compilers, 2017-05-05) we no longer filter out all `gcc*` implicit link libraries. This allows mixing of gcc and non-gcc compilers across languages. However, this caused a subtle problem with how GCC makes exception handling symbols available to linked binaries. GCC (at least on MinGW) provides two different libraries with exception handling symbols: * gcc_s: A shared library with -fvisibility=default, used by -shared-libgcc. * gcc_eh: A static library with -fvisibility=hidden, used by -static-libgcc. The C compiler (on MinGW) defaults to -static-libgcc and uses gcc_eh. The C++ compiler defaults to -shared-libgcc and uses gcc_s when linking shared libraries and executables so that exceptions can propagate across shared libraries [1]. When linking a mixed-language binary, the C++ compiler should be used along with its choice of gcc_s. In this case gcc_eh should not be added even though the C compiler implies it because gcc_s supersedes it. Since the above-mentioned change, CMake is adding gcc_eh to C++ link lines that also contain C code on MinGW. This causes both gcc_s and gcc_eh to be used, which is incorrect. We can fix this simply by excluding gcc_eh from the C compiler's implicit link libraries. [1] https://gcc.gnu.org/onlinedocs/gcc-7.2.0/gcc/Link-Options.html#Link-Options Fixes: #17436
* | | | | Merge branch 'FindOpenGL-clarify-libraries' into release-3.10Brad King2017-11-071-1/+2
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Merge-request: !1459
| * | | | FindOpenGL: Clarify logic constructing OPENGL_LIBRARIESBrad King2017-11-071-1/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | Our comment says the logic matches that for OpenGL::GL. Structure the logic the same way to make this clearer. Issue: #17437
* | | | Merge branch 'csharp-version-english' into release-3.10Brad King2017-11-071-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1449
| * | | | CSharp: Fix compiler version detection in non-English languagesYoshinori Tahara2017-11-071-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | When we run `csc.exe /help` we look for "Version" in the output. Explicitly ask for the output in English. Reported-by: guttally@users.noreply.github.com
* | | | Merge branch 'irsl-win2018' into release-3.10Brad King2017-11-061-3/+5
|\ \ \ \ | |_|_|/ |/| | | | | | | Merge-request: !1451
| * | | IRSL: Add support for the 2018 release on Windows.Christian Pfeiffer2017-11-061-3/+5
| |/ / | | | | | | | | | Fixes: #17421
* | | CMake 3.10.0-rc4v3.10.0-rc4Brad King2017-11-011-1/+1
| | |
* | | Merge branch 'mingw-clang-c-compile-features' into release-3.10Brad King2017-11-011-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !1435
| * | | Record C compile features flags for MinGW Clang on WindowsBrad King2017-11-011-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This was done for C++ by commit v3.5.0-rc1~69^2 (Record compile features for MinGW Clang on Windows, 2016-01-11). Make the same change for C. The `UNIX` condition on Clang C compiler features was already dropped by refactoring in commit v3.9.0-rc1~17^2~4 (Compilers: Port to use default cmake_record_lang_compile_features macros, 2017-05-10). Our documentation already claims support for this combination. This was simply an oversight when support was added for MinGW Clang C++. Issue: #15897 Issue: #15943
* | | Merge branch 'autogen-moc-predefs-no-moc-options' into release-3.10Brad King2017-10-312-3/+12
|\ \ \ | | | | | | | | | | | | Merge-request: !1432
| * | | Autogen: Tests: Set AUTOMOC_MOC_OPTIONS in a simple testSebastian Holtermann2017-10-311-0/+5
| | | |
| * | | Autogen: Don't use AUTOMOC_MOC_OPTIONS in moc-predefs commandSebastian Holtermann2017-10-311-3/+7
|/ / / | | | | | | | | | Closes #17418
* | | Merge branch 'autogen-change-rcc-config-suffix' into release-3.10Brad King2017-10-301-2/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !1425
| * | | Autogen: Make rcc output file suffix static (instead of pseudo-random)Sebastian Holtermann2017-10-301-2/+2
|/ / /
* | | Merge branch 'autogen-qrc-file-name' into release-3.10Brad King2017-10-301-5/+15
|\ \ \ | | | | | | | | | | | | Merge-request: !1422
| * | | Autogen: RCC: Append checksum suffix to wrapped file nameSebastian Holtermann2017-10-291-5/+15
| | | | | | | | | | | | | | | | Closes #17404
* | | | Merge branch 'cpack-rpm-dist-test-fix' into release-3.10Brad King2017-10-301-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1424
| * | | | CPack/RPM: DIST-MONOLITHIC-type subtest fixDomen Vrankar2017-10-301-0/+5
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Test was failing in case dist macro contained a + symbol which is valid but must be escaped for using the string as a regex. Fixes #17328
* | | | Merge branch 'backport-fix-co-compile' into release-3.10Brad King2017-10-2716-87/+175
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1418
| * | | | cmcmd: Restore support for running multiple lint toolsBrad King2017-10-2715-61/+166
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.10.0-rc1~115^2 (Clean up iwyu code to not be one big if statement, 2017-08-28) incorrectly changed the logic to run only one lint tool at a time. Restore support for running all tools specified on the command-line.
| * | | | cmcmd: Convert lint handlers to file-static functionsBrad King2017-10-272-29/+12
| | | | | | | | | | | | | | | | | | | | These do not need to be declared in the header.
| * | | | cmcmd: Rename loop iteration variable for clarityBrad King2017-10-271-2/+2
| | | | |
* | | | | Merge branch 'autogen-static-library-cycles' into release-3.10Brad King2017-10-2710-17/+172
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1408
| * | | | | Autogen: Tests: Add test for STATIC_LIBRARY cyclesSebastian Holtermann2017-10-279-0/+89
| | | | | |
| * | | | | Autogen: Don't add STATIC_LIBRARY cycle targets to the _autogen dependenciesSebastian Holtermann2017-10-271-17/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a STATIC_LIBRARY cycle is detected we don't add any STATIC_LIBRARY target from the cycle to the `_autogen` target dependencies. Closes #17389
* | | | | | Merge branch 'cmp0040-wording' into release-3.10Brad King2017-10-263-5/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | Merge-request: !1415
| * | | | | CMP0040: Clarify policy warning to match documentationBrad King2017-10-263-5/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~8^2~2 (Help: Clarify policy `CMP0040` documentation, 2016-01-28) the documentation was clarified to indicate that the target must be defined in the current directory. Do the same for the text of the policy warning itself. Fixes: #17399
generated by cgit v0.12 at 2025-01-10 22:16:14 (GMT)