summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Autogen: Turn off moc path prefix generation by defaultJoerg Bornemann2020-08-101-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change the default value of `CMAKE_AUTOMOC_PATH_PREFIX` to `OFF` to restore compatibility with behavior of CMake 3.15 and below. C++ source files that are generated by Qt's meta object compiler (moc) include the header file that was passed as input argument to moc. This is usually a path relative to the source directory, for example #include "../../source/dir/myobject.h" That is problematic for reproducible builds as described in #18815. To cope with that, the target property AUTOMOC_PATH_PREFIX was introduced in CMake 3.16 by commit d018d27c10 (Autogen: Add moc path prefix generation (AUTOMOC_PATH_PREFIX), 2019-09-13, v3.16.0-rc1~94^2~4). The property is default-initialized from the variable `CMAKE_AUTOMOC_PATH_PREFIX`, which defaults to `ON`. If this property is ON, and myobject.h is located in an include directory of the target, moc-generated C++ files include the file without the "path prefix": #include "myobject.h" This behavior, however, can break projects that have equally named header files in different include directories. As "not breaking existing projects" trumps "have reproducible builds by default" we change the default of `CMAKE_AUTOMOC_PATH_PREFIX` to `OFF`. Also, it is now possible to pass `-DCMAKE_AUTOMOC_PATH_PREFIX=ON` on the CMake command line. Before, it was overridden in `CMakeGenericSystem`. Fixes: #20598 Issue: #18815
* Merge branch 'backport-3.16-objc-env-vars' into release-3.16Brad King2020-05-142-18/+24
|\
| * Objective C/C++: Honor CC and CXX env vars to select compilerBrad King2020-05-142-18/+24
| | | | | | | | | | | | | | If the `OBJC` or `OBJCXX` environment variable is not set to specify an Objective C or C++ compiler, check `CC` or `CXX` too. Fixes: #20703
* | Merge branch 'pch-msvc-pragma' into release-3.16Brad King2020-05-111-7/+5
|\ \ | | | | | | | | | Merge-request: !4736
| * | MSVC: Use 'pragma system_header' in PCH only on cl 19.13 and aboveBrad King2020-05-111-7/+5
| |/ | | | | | | | | | | | | VS 2017 15.6 introduced support for this pragma. Older MSVC versions warn that it is unknown. Fixes: #20692
* | Merge branch 'FindGTK2-harfbuzz-target' into release-3.16Brad King2020-05-091-3/+6
|\ \ | | | | | | | | | Merge-request: !4725
| * | FindGTK2: Add harfbuzz target for dependency from pangoBrad King2020-05-091-3/+6
| |/ | | | | | | | | | | | | | | | | | | Since commit effafca77e (FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRS, 2019-10-01, v3.16.0-rc1~22^2), pango's dependency on harfbuzz has been captured, but only for the `GTK2_INCLUDE_DIRS` and `GTK2_LIBRARIES` variables. Add the `GTK2::harfbuzz` imported target and update the `GTK2::pango` target to depend on it. Issue: #19531
* | Merge branch 'backport-3.16-FindPkgConfig-isystem' into release-3.16Brad King2020-05-061-8/+42
|\ \ | | | | | | | | | Merge-request: !4693
| * | FindPkgConfig: also handle "-isystem" prefixes for include directoriesRolf Eike Beer2020-05-051-8/+42
| |/ | | | | | | Fixes: #20652
* | Merge branch 'CheckLanguage-cuda-host' into release-3.16Brad King2020-05-051-1/+1
|\ \ | | | | | | | | | Merge-request: !4711
| * | CheckLanguage: Fix forwarding of CMAKE_CUDA_HOST_COMPILERBrad King2020-05-051-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | Fix the condition added by commit fada8cbfd6 (CheckLanguage: Report CMAKE_CUDA_HOST_COMPILER if needed for compilation, 2019-05-31, v3.15.0-rc1~12^2) to activate CUDA-specific logic. The old condition had worked in our test suite only by accident because the loop variable used in the test happened to be the name and value that the old condition used! Update the test to use a different name. Fixes: #19013
* | FindMPI: Add the pgi compiler wrapper names used by IBM Spectrum MPIChuck Atkins2020-04-101-3/+3
|/
* Merge branch 'FindPython-fix-VIRTUALENV-eq-FIRST' into release-3.16Brad King2020-04-011-1/+1
|\ | | | | | | Merge-request: !4557
| * FindPython: fix handling when FIND_VIRTUALENV == FIRSTMarc Chevrier2020-04-011-1/+1
| | | | | | | | Fixes: #20525
* | GetPrerequisites: Classify vcruntime libraries as systemErr0rC0deX2020-03-191-3/+3
|/ | | | | Previously GetPrerequisites classified `vcruntime*.dll` as type "other". They should be classified as type "system".
* Merge branch 'backport-3.16-FindPython-cache-cleanup' into release-3.16Brad King2020-02-271-51/+98
|\ | | | | | | | | | | | | | | 1dc524f2 FindPython: Do not cache computed result variables in CMake 3.16 602d1d82 FindPython: Mark non-public cache entries INTERNAL in CMake 3.16 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4399
| * FindPython: Do not cache computed result variables in CMake 3.16Marc Chevrier2020-02-261-2/+2
| | | | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally add the result variables `Python*_LIBRARY_RELEASE` and `Python*_LIBRARY_DEBUG` to the cache. They are always computed from other results and so should not be presented to users in cmake-gui and ccmake to edit. Issue: #20362
| * FindPython: Mark non-public cache entries INTERNAL in CMake 3.16Marc Chevrier2020-02-261-48/+95
| | | | | | | | | | | | | | | | | | Since commit 06d9e67fbd (FindPython: Add capability to specify directly artifacts, 2019-08-15, v3.16.0-rc1~157^2) we accidentally expose cache entries named `_Python...` to users in cmake-gui and ccmake. Mark those entries as `INTERNAL` to hide them. Issue: #20362
* | Merge branch 'FindPkgConfig-scope' into release-3.16Brad King2020-02-241-0/+6
|\ \ | | | | | | | | | Merge-request: !4388
| * | FindPkgConfig: set policies CMP0054 and CMP0057 to newRolf Eike Beer2020-02-241-0/+6
| |/ | | | | | | | | | | One may encounter warnings if FindPkgConfig is used in any project, even indirectly, that has set any of these policies to old explicitely or requires an older version.
* | Merge branch 'backport-cuda-non-device-link' into release-3.16Brad King2020-02-241-1/+1
|\ \ | |/ |/| | | Merge-request: !4376
| * Ninja: Do not use nvcc response files with non-nvcc toolsFrancisco Facioni2020-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Since commit d91b5a72cd (Ninja: Add support for CUDA nvcc response files, 2019-05-30, v3.15.0-rc1~8^2) we use NVCC's `--options-file` option to avoid long link command lines via a response file. However, for non-device linking the host tools are used and the option does not make sense. Update the logic to use `--options-file` only for device linking. Linking with the host tools already has its own logic for response files. Fixes: #19954
| * Merge branch 'msvc-runtime-library-masm' into release-3.15Brad King2020-01-211-0/+6
| |\ | | | | | | | | | Merge-request: !4257
* | \ Merge topic 'android-ndk-r19-binutils' into release-3.16Brad King2020-02-041-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e3d3b7ddeb Android: Fix binutils selection with NDK r19+ unified toolchain Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4318
| * | | Android: Fix binutils selection with NDK r19+ unified toolchainBrad King2020-02-031-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 97bca2f9fa (Android: Use unified toolchain in NDK r19+, 2019-07-26, v3.16.0-rc1~342^2) we hard-coded use of the unified toolchain for NDK r19+ and skipped most of the old detection logic. However, in that fast path we left out setting `_CMAKE_TOOLCHAIN_PREFIX` for `CMakeFindBinutils` to select the matching binutils. Add it. Fixes: #20038
* | | | Merge topic 'aix-skip-exports' into release-3.16Brad King2020-01-311-1/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a17f6eff43 AIX: Restore pre-3.16 undocumented method to suppress exports with XL Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4303
| * | | | AIX: Restore pre-3.16 undocumented method to suppress exports with XLBrad King2020-01-301-1/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 0f150b69d3 (AIX: Explicitly compute shared object exports for both XL and GNU, 2019-07-11, v3.16.0-rc1~418^2~2) we dropped use of the old `CMAKE_XL_CreateExportList` cache entry for XL exports. However, some people were setting the value to an empty string as a way to disable automatic export of symbols. Restore this behavior when the option is explicitly set to an empty string. Issue: #20290
* | | | CPack: Fix regression in Deb descriptionKyle Edwards2020-01-242-2/+4
| | | | | | | | | | | | | | | | Fixes: #20254
* | | | Help: Add more variable documentation to FindMPIKyle Edwards2020-01-221-5/+17
| | | |
* | | | Merge topic 'msvc-runtime-library-masm' into release-3.16Brad King2020-01-221-0/+6
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | 1421005835 ASM_MASM: Populate MSVC runtime library abstraction table Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4257
| * | ASM_MASM: Populate MSVC runtime library abstraction tableBrad King2020-01-211-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit fb3370b6a1 (MSVC: Add abstraction for runtime library selection, 2019-04-10, v3.15.0-rc1~229^2) we overlooked populating the runtime library selection flags for the Microsoft assembler. It does not actually have any such flags, but since its compiler id is `MSVC` our generators expect the table to be populated. Use empty values. Without this fix, enabling the `ASM_MASM` language with policy `CMP0091` set to `NEW` causes an error due to the missing table entries. Fixes: #20236, #19453
* | | Merge topic 'InstallRequiredSystemLibraries-redist' into release-3.16Brad King2020-01-211-6/+20
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | 7ca923bcaf IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if available Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Andrey Vihrov <andrey.vihrov@gmail.com> Merge-request: !4247
| * | IRSL: Install msvcp140_{1,2,codecvt_ids}.dll if availableBrad King2020-01-201-6/+20
| |/ | | | | | | | | | | | | VS now distributes these additional runtime libraries. Install them if available. Fixes: #20228
| * Merge branch 'FindBLAS-OpenBLAS-thread' into release-3.15Brad King2019-12-121-2/+6
| |\ | | | | | | | | | Merge-request: !4134
| * \ Merge branch 'backport-3.15-vs-v142-version' into release-3.15Brad King2019-12-121-3/+4
| |\ \ | | | | | | | | | | | | Merge-request: !4133
| | * | VS: Fix support for v142 toolset minor versions in VS 16.5+Brad King2019-12-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit 5117389931 (VS: Fix support for v142 toolset minor versions, 2019-10-01, v3.15.5~6^2) worked around a bug in VS's placement of toolset files. VS 16.5 will fix that bug and restore the original pattern for locations of toolset files. Update our logic to look for both possibilities. Issue: #19779
| * | | Merge branch 'backport-3.15-FindGTK2-harfbuzz' into release-3.15Brad King2019-12-091-0/+3
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !3877
| | * | | FindGTK2: Add harfbuzz to GTK2_INCLUDE_DIRSMarkus Mittendrein2019-12-091-0/+3
| | | | | | | | | | | | | | | | | | | | Fixes: #19531
| * | | | Merge branch 'backport-implicit-includes-extra-CR' into release-3.15Brad King2019-11-261-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !4088
| * \ \ \ \ Merge branch 'backport-FindBoost-meta-component-ALL' into release-3.15Brad King2019-11-071-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !4008
| | * | | | | FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73Deniz Bahadir2019-11-071-0/+3
| | | |_|/ / | | |/| | |
| * | | | | Merge branch 'backport-findpostgres-10-and-older' into release-3.15Brad King2019-11-071-5/+16
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | Merge-request: !4007
| | * | | | FindPostgreSQL: support version encoding used in pre-10 releasesBen Boeckel2019-11-071-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | With the 10.x release, PostgreSQL upstream started encoding the version as `MMmmmm` where `M` is major and `m` is minor. Prior to that, `MMmmPP` was used where `P` was the patch number. Detect this difference and decode it based on the used encoding. Fixes: #19912
| | * | | | Merge branch 'FindBISON-CMP0088-SourcePath' into release-3.14Brad King2019-07-121-3/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3549
| | * \ \ \ \ Merge branch 'backport-implicit-includes-cray-hlist' into release-3.14Brad King2019-07-091-2/+2
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3532
* | | \ \ \ \ \ Merge topic 'findopenssl-dependencies-link-order' into release-3.16Brad King2020-01-171-7/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d2880aaa06 FindOpenSSL: Fix ordering of dependency link flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4235
| * | | | | | | | FindOpenSSL: Fix ordering of dependency link flagsAshley Whetter2020-01-161-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #20082, #20224
* | | | | | | | | Merge topic 'nag-submodule' into release-3.16Brad King2020-01-161-0/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7f60ddcf9 Fortran: Add support for NAG Fortran submodules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !4229
| * | | | | | | | | Fortran: Add support for NAG Fortran submodulesNeil Carlson2020-01-151-0/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They use a `.sub` extension. Fixes: #20220
* | | | | | | | | Merge topic 'python39' into release-3.16Brad King2020-01-153-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f6474214b3 FindPython: Add support for version 3.9 Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Marc Chevrier <marc.chevrier@gmail.com> Acked-by: Björn Esser <besser82@fedoraproject.org> Merge-request: !4225
generated by cgit v0.12 at 2025-01-15 08:07:55 (GMT)