summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindOpenSSL: Lookup all pkg-config directoriesDenis Thulin2019-11-071-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a custom sysroot to build things using pkg-config, some of the output variables feature the sysroot while others do not: ```console $ export PKG_CONFIG_SYSROOT_DIR=/path/to/sysroot $ export PKG_CONFIG_LIBDIR=/path/to/sysroot/usr/lib/pkgconfig $ pkg-config --cflags-only-I openssl -I/path/to/sysroot/usr/include/ $ pkg-config --variable=includedir openssl /usr/include $ pkg-config --libs-only-L openssl -L/path/to/sysroot/usr/lib $ pkg-config --variable=libdir openssl /usr/lib ``` When using `pkg_check_modules`, it's pretty much the same: ```cmake pkg_check_modules(_OPENSSL QUIET openssl) _OPENSSL_INCLUDE_DIRS == /path/to/sysroot/usr/include/ _OPENSSL_INCLUDEDIR == /usr/include _OPENSSL_LIBRARY_DIRS == -L/path/to/sysroot/usr/lib _OPENSSL_LIBDIR == /usr/lib ``` However, FindOpenSSL only searches for headers in `INCLUDEDIR` and libraries in `LIBDIR` instead of searching `INCLUDE_DIRS` and `LIBRARY_DIRS` as well. This fixes that behaviour. Fixes: #16885 Signed-off-by: Denis Thulin <denis.thulin@enyx.fr>
* CMake Nightly Date StampKitware Robot2019-11-071-1/+1
|
* Merge topic 'modernize-memory-management'Kyle Edwards2019-11-062-63/+59
|\ | | | | | | | | | | | | 2a67ebf71b cmGeneratorTarget: modernize memory management Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3997
| * cmGeneratorTarget: modernize memory managementMarc Chevrier2019-11-052-63/+59
| |
* | Merge topic 'install-name-dir-genex'Brad King2019-11-0626-18/+175
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | a0e2e0ca97 Help: Add documentation and release notes for INSTALL_NAME_DIR genex deeab72aae Tests: Add tests for INSTALL_NAME_DIR 3c85f11fed INSTALL_NAME_DIR: Add support for generator expressions 2ec1156b80 Refactor: Generalize cmExportInstallFileGenerator::ReplaceInstallPrefix() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3989
| * | Help: Add documentation and release notes for INSTALL_NAME_DIR genexKyle Edwards2019-11-053-1/+13
| | |
| * | Tests: Add tests for INSTALL_NAME_DIRKyle Edwards2019-11-0517-0/+123
| | |
| * | INSTALL_NAME_DIR: Add support for generator expressionsKyle Edwards2019-11-044-8/+21
| | |
| * | Refactor: Generalize cmExportInstallFileGenerator::ReplaceInstallPrefix()Kyle Edwards2019-11-013-9/+18
| | |
* | | Merge topic 'ccmake_colored_values'Brad King2019-11-0611-15/+136
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5d5ba3f7f ccmake: Identify the current cache entry 005aba29a1 ccmake: Improve display of the key controls 93b66735ac ccmake: Use type-based colors to display cache values Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3955
| * | | ccmake: Identify the current cache entrySylvain Joubert2019-11-041-0/+9
| | | |
| * | | ccmake: Improve display of the key controlsSylvain Joubert2019-11-042-9/+9
| | | | | | | | | | | | | | | | Reduce space usage and add the key to display the output
| * | | ccmake: Use type-based colors to display cache valuesSylvain Joubert2019-11-049-6/+118
| | | | | | | | | | | | | | | | | | | | The colors are based on the entry type (or value for booleans), paths and filepaths sharing the same color.
* | | | Merge topic 'cpack-nsis-welcome-finish-title'Brad King2019-11-064-6/+61
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 68b5af65fa CPack/NSIS: Add options for custom welcome/finish titles + display on 3 lines Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3980
| * | | | CPack/NSIS: Add options for custom welcome/finish titles + display on 3 linesJohnny Jazeix2019-11-054-6/+61
| | | | | | | | | | | | | | | | | | | | Fixes: #11275
* | | | | Merge branch 'release-3.16'Brad King2019-11-060-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge topic 'FindBoost-meta-component-ALL' into release-3.16Brad King2019-11-061-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77a01c398f FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3996
* | \ \ \ \ \ Merge topic 'FindBoost-meta-component-ALL'Brad King2019-11-061-0/+3
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 77a01c398f FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3996
| * | | | | | FindBoost: Prevent warning due to new meta-component "ALL" of Boost 1.73Deniz Bahadir2019-11-051-0/+3
| | | | | | |
* | | | | | | Merge branch 'release-3.16'Brad King2019-11-060-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'xcode-restore-CMakeLists' into release-3.16Brad King2019-11-064-10/+35
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ce8a5c08d Xcode: Fix generated references to CMakeLists.txt files 9457c95aa0 cmGlobalXCodeGenerator: Mark known source locations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3999
* | \ \ \ \ \ \ Merge topic 'xcode-restore-CMakeLists'Brad King2019-11-064-10/+35
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ce8a5c08d Xcode: Fix generated references to CMakeLists.txt files 9457c95aa0 cmGlobalXCodeGenerator: Mark known source locations Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3999
| * | | | | | | Xcode: Fix generated references to CMakeLists.txt filesBrad King2019-11-054-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit 2d888e3390 (cmSourceFile: Rename mutating GetFullPath() overload, 2019-08-29, v3.16.0-rc1~160^2) accidentally left the paths to `CMakeLists.txt` files empty in generated Xcode project files. Fixes: #19927
| * | | | | | | cmGlobalXCodeGenerator: Mark known source locationsBrad King2019-11-051-4/+8
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'release-3.16'Craig Scott2019-11-060-0/+0
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge topic 'doc-discourse' into release-3.16Craig Scott2019-11-065-22/+19
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4af39fe25b CMakeSystemSpecificInformation: Replace mailing list with Discourse Forum d0be4d5365 README: Replace link to mailing list the CMake Discourse Forum 4dd6ad20b6 README: Update links to cmake.org pages 821bfca89b Help: Replace links to mailing lists with links to our Discourse Forum 32d8de1463 CMakeCPack: Update Debian package contact email 2fae9101e5 Help/dev: Update maintainer guide for Discourse transition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3998
* | \ \ \ \ \ \ Merge topic 'doc-discourse'Craig Scott2019-11-065-22/+19
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4af39fe25b CMakeSystemSpecificInformation: Replace mailing list with Discourse Forum d0be4d5365 README: Replace link to mailing list the CMake Discourse Forum 4dd6ad20b6 README: Update links to cmake.org pages 821bfca89b Help: Replace links to mailing lists with links to our Discourse Forum 32d8de1463 CMakeCPack: Update Debian package contact email 2fae9101e5 Help/dev: Update maintainer guide for Discourse transition Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3998
| * | | | | | | CMakeSystemSpecificInformation: Replace mailing list with Discourse ForumBrad King2019-11-061-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On unknown platforms we issue a message instructing users to post to our mailing list to add support for the platform. Refer them to the CMake Discourse Forum instead.
| * | | | | | | README: Replace link to mailing list the CMake Discourse ForumBrad King2019-11-061-3/+3
| | | | | | | |
| * | | | | | | README: Update links to cmake.org pagesBrad King2019-11-051-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some of the links refer to URLs that are now redirected. Update them.
| * | | | | | | Help: Replace links to mailing lists with links to our Discourse ForumBrad King2019-11-051-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMake Discourse Forum at `discourse.cmake.org` supersedes the mailman-based mailing lists.
| * | | | | | | CMakeCPack: Update Debian package contact emailBrad King2019-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace the mailing list email address with one on `discourse.cmake.org`.
| * | | | | | | Help/dev: Update maintainer guide for Discourse transitionBrad King2019-11-051-5/+6
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Replace the post-release development announcement to the mailing list with a post to the appropriate category on `discourse.cmake.org`.
* | | | | | | CMake Nightly Date StampKitware Robot2019-11-061-1/+1
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge topic 'remove_sh_error_mingw'Brad King2019-11-052-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82ddcf0db1 MinGW Makefiles: do not fail if sh.exe is present in the path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3978
| * | | | | | MinGW Makefiles: do not fail if sh.exe is present in the pathJohnny Jazeix2019-11-042-6/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check was added only to fail early in an environment known not to work at the time: * https://web.archive.org/web/20120912010035/http://lists.trolltech.com/qt-interest/2006-01/thread00091-0.html Fixes: #19327
* | | | | | Merge branch 'release-3.16'Brad King2019-11-050-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'findpostgres-10-and-older' into release-3.16Brad King2019-11-052-8/+28
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !3993
| * \ \ \ \ \ Merge branch 'source_group-tree' into release-3.16Brad King2019-11-053-5/+43
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3979
| * \ \ \ \ \ \ Merge branch 'objc-pch' into release-3.16Brad King2019-11-054-10/+31
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3983
| * \ \ \ \ \ \ \ Merge branch 'clarify_compile_features_documentation' into release-3.16Brad King2019-11-053-15/+15
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3988
| * \ \ \ \ \ \ \ \ Merge branch 'docs-INSTALL_REMOVE_ENVIRONMENT_PATH' into release-3.16Brad King2019-11-053-12/+18
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !3985
* | \ \ \ \ \ \ \ \ \ Merge topic 'source_group-tree'Brad King2019-11-053-5/+43
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c0ca5a9d9 source_group: ensure that passed file is not a directory Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3979
| * | | | | | | | | | source_group: ensure that passed file is not a directoryMateusz Janek2019-11-043-5/+43
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #19769
* | | | | | | | | | Merge topic 'clarify_compile_features_documentation'Brad King2019-11-053-15/+15
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 53cd86ea78 Help: Clarify what 'aware' means as it relates to C++ standards Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3988
| * | | | | | | | | Help: Clarify what 'aware' means as it relates to C++ standardsRobert Maynard2019-11-043-15/+15
| |/ / / / / / / /
* | | | | | | | | Merge topic 'objc-pch'Brad King2019-11-054-10/+31
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e331367a89 PCH: Add support for OBJC/OBJCXX languages Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3983
| * | | | | | | | PCH: Add support for OBJC/OBJCXX languagesCristian Adam2019-11-034-10/+31
| | | | | | | | |
* | | | | | | | | Merge topic 'findpostgres-10-and-older'Brad King2019-11-052-8/+28
|\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e992d62b7e FindPostgreSQL: support version encoding used in pre-10 releases Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !3993
| * | | | | | | | FindPostgreSQL: support version encoding used in pre-10 releasesBen Boeckel2019-11-042-8/+28
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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