summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'WriteBasicConfigVersionFile_SameMinorVersion'Craig Scott2017-11-223-6/+58
|\ | | | | | | | | | | | | | | | | 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
| * WriteBasicConfigVersionFile: Add SameMinorVersion COMPATIBILITY optionDaniele E. Domenichelli2017-11-213-6/+58
| |
* | Merge topic 'gtest-fix-discovery'Brad King2017-11-211-2/+25
|\ \ | | | | | | | | | | | | | | | | | | 70f9f62d GoogleTest: Fix multiple discovery on same target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1510
| * | GoogleTest: Fix multiple discovery on same targetMatthew Woehlke2017-11-211-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'irsl-intel-1041-folder'Christian Pfeiffer2017-11-211-1/+4
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8e7e7af5 IRSL: Install the 1041 folder for Intel compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1509
| * | | IRSL: Install the 1041 folder for Intel compilersChristian Pfeiffer2017-11-201-1/+4
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | 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.
* | | Merge topic 'findqt4-dirs-fix'Christian Pfeiffer2017-11-211-1/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f81d186b FindQt4: Set PLUGINS and IMPORTS dir even if empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1503
| * | | FindQt4: Set PLUGINS and IMPORTS dir even if emptyChristian Pfeiffer2017-11-191-1/+12
| |/ / | | | | | | | | | | | | Fixes: #14155 Issue: #17492
* | | Merge topic 'wxwidgets-env-variables'Christian Pfeiffer2017-11-212-4/+6
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9b503cc8 wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1504
| * | | wxWidgets: Respect WX_CONFIG and WXRC_CMD env varsChristian Pfeiffer2017-11-192-4/+6
| |/ / | | | | | | | | | Issue: #17492
* | | Merge topic 'imagemagick-6-freebsd-names'Christian Pfeiffer2017-11-211-0/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 35b8a26b FindImageMagick: Add more library names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1505
| * | | FindImageMagick: Add more library namesChristian Pfeiffer2017-11-201-0/+9
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge topic 'autogen-rcc-custom-command'Brad King2017-11-202-7/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Autogen: Use integers instead of strings for the Qt versionSebastian Holtermann2017-11-191-1/+0
| | | |
| * | | Autogen: Detect rcc feature once during configurationSebastian Holtermann2017-11-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | Autogen: Add and use cmQtAutoGenerator base classSebastian Holtermann2017-11-191-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Adds the new base class `cmQtAutoGenerator` which contains common variables and methods used by `cmQtAutoGeneratorMocUic` and `cmQtAutoGeneratorRcc`.
| * | | Autogen: Remove rcc code from cmQtAutoGeneratorsSebastian Holtermann2017-11-191-6/+0
| | | |
| * | | Autogen: Switch to use custom commands for RCCSebastian Holtermann2017-11-191-0/+11
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of processing all `rcc` invocation requests in the _autogen target that calls `cmake -E cmake_autogen ...` once, use a dedicated custom command that calls `cmake -E cmake_autorcc ...` for each `.qrc` file. This allows parallel `.qrc` file processing and reduces the workload (and complexity) in the _autogen target. If only `AUTORCC` is enabled, the _autogen target won't be created at all since it is now used for `AUTOMOC` and `AUTOUIC` only. For `.qrc` files that are GENERATED a custom target is used instead of a custom command. Closes #17161
* | | Merge topic 'cpack-minor-cleanup-and-tests-extension'Brad King2017-11-202-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | CPack: set variable commands in lower caseDomen Vrankar2017-11-191-1/+1
| | | |
| * | | CPack: documentation typo fixDomen Vrankar2017-11-191-1/+1
| |/ /
* | | Merge topic 'FindOpenGL-glvnd-policy'Brad King2017-11-201-4/+33
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | 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
| * | FindOpenGL: Add policy CMP0072 to prefer GLVND for legacy GLBrad King2017-11-171-4/+33
| | | | | | | | | | | | Fixes: #17449
* | | Merge topic 'blas-lapack-flame'Brad King2017-11-172-0/+30
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f5bc7826 Find{BLAS,LAPACK}: Add support for FLAME blis and libflame Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1486
| * | | Find{BLAS,LAPACK}: Add support for FLAME blis and libflameJ M Dieterich2017-11-162-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | FLAME (github.com/flame) provides a variety of numerical libraries. `blis` and `libflame` can be setup to expose BLAS/LAPACK interfaces. Fixes: #17470
* | | | Merge topic 'FindRuby-through-2.4'Brad King2017-11-171-3/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cd2cdfe2 FindRuby: Add support for versions 2.2, 2.3, and 2.4 23ab451a FindRuby: Fix match of '.' in version numbers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1493
| * | | | FindRuby: Add support for versions 2.2, 2.3, and 2.4Brad King2017-11-161-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Author: J. Peter Mugaas (jpmugaas on gitlab.kitware.com) Fixes: #17475
| * | | | FindRuby: Fix match of '.' in version numbersBrad King2017-11-161-3/+3
| |/ / / | | | | | | | | | | | | | | | | Escape `.` so that it is matched literally and not treated as a special match of any character by the regex.
* | | | Merge topic 'fomp-cmp0012'Christian Pfeiffer2017-11-171-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 36cc4378 FindOpenMP: Enable policy CMP0012 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1490
| * | | | FindOpenMP: Enable policy CMP0012Christian Pfeiffer2017-11-161-0/+1
| |/ / / | | | | | | | | | | | | Fixes: #17476
* | | | Merge topic 'FindMatlab-better-host-detect'Brad King2017-11-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9f1916aa FindMatlab: Avoid if() auto-dereference in 64-bit host detection Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1482
| * | | | FindMatlab: Avoid if() auto-dereference in 64-bit host detectionBrad King2017-11-151-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the value of `CMAKE_HOST_SYSTEM_PROCESSOR` also happens to be set as a variable by a project (e.g. `AMD64`), allowing `if()` to auto-dereference is unlikely to produce a value that matches "64". Instead let `if()` auto-dereference `CMAKE_HOST_SYSTEM_PROCESSOR`. Fixes: #17460
* | | | Merge topic 'fomp-no-def-path'Brad King2017-11-161-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 98314d53 FindOpenMP: Use NO_DEFAULT_PATH where appropriate Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1481
| * | | | FindOpenMP: Use NO_DEFAULT_PATH where appropriateChristian Pfeiffer2017-11-151-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenMP libraries must always be found in the implicit linking directories of a compiler when using the OpenMP compile flag. If a suitable OpenMP library is also found in for example some CMAKE_PREFIX_PATH, this can lead to the module finding the incorrect library. On the other hand, CMAKE_PREFIX_PATH can't ever be a location that we need to consider since the OpenMP compile flag would not work if we needed to.
* | | | Merge topic 'fmpi-command-not-found'Brad King2017-11-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1615cded FindMPI: Treat 'command not found' as an error Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1483
| * | | | FindMPI: Treat 'command not found' as an errorChristian Pfeiffer2017-11-151-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the compiler given in I_MPI_... could not be found, the Intel MPI wrappers emit an error like "line 590: ifort: command not found". The script should currently fail to match the output of this for information, but we should generally treat such an output as invalid, since the displayed configuration line can become a mixup between Intel and GNU compiler settings.
* | | | Merge topic 'msvc-version'Brad King2017-11-161-1/+5
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 3bc21a70 MSVC: Fix MSVC_VERSION when mixing MSVC C/C++ with Intel Fortran Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1488
| * | | MSVC: Fix MSVC_VERSION when mixing MSVC C/C++ with Intel FortranBrad King2017-11-151-1/+5
| |/ / | | | | | | | | | | | | | | | | | | | | | When using a real MSVC compiler for `C` or `CXX`, use the version of that compiler for `MSVC_VERSION`. This is preferred over the MSVC version that a non-MSVC compiler "simulates". Fixes: #17468
* | | Merge topic 'FindOpenGL-glvnd-preference'Brad King2017-11-161-13/+57
|\ \ \ | |/ / |/| / | |/ | | | | | | | | | | ff3c11ee FindOpenGL: Add option to prefer GLVND for legacy GL aadc38c7 FindOpenGL: Re-order component library searches Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Clinton Stimpson <clinton@elemtech.com> 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 'doxygen_dot' into release-3.10Brad King2017-11-101-1/+5
| |\ | | | | | | | | | Merge-request: !1472
| * \ Merge branch 'FindOpenGL-no-glvnd-for-GL' into release-3.10Brad King2017-11-091-20/+24
| |\ \ | | | | | | | | | | | | Merge-request: !1466
| * \ \ Merge branch 'FindHDF5-c-version' into release-3.10Brad King2017-11-081-1/+1
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !1465
| * \ \ \ Merge branch 'implicit-lib-gcceh' into release-3.10Brad King2017-11-081-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1460
| * \ \ \ \ Merge branch 'FindOpenGL-clarify-libraries' into release-3.10Brad King2017-11-071-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1459
| * \ \ \ \ \ Merge branch 'csharp-version-english' into release-3.10Brad King2017-11-071-1/+1
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1449
| * \ \ \ \ \ \ Merge branch 'irsl-win2018' into release-3.10Brad King2017-11-061-3/+5
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1451
* | \ \ \ \ \ \ \ Merge topic 'swig-broken-dependency-scan'Brad King2017-11-131-1/+34
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ee10119 swig: fix incremental build in case of removed interface files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1457
| * | | | | | | | | swig: fix incremental build in case of removed interface filesFelix Schwitzer2017-11-081-1/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.8.0-rc1~123^2 (UseSWIG: Automatically scan dependencies of SWIG files for Makefiles, 2016-12-21) introduced automatic dependency scanning for files `%include`d in a swig interface definition file. This works fine as long as no such file is removed. But removing a dependent file breaks an incremental build and `make` complains about a missing dependency, see #16830. Integrate the approach proposed in the issue above into the SWIG-module, do the workaround in a conditional step as it arises only for Makefile generators. For other generators use the implementation before that commit. Fixes: #17433.
generated by cgit v0.12 at 2024-11-12 02:15:23 (GMT)