summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'findxmlrpc_fix'Brad King2017-05-261-18/+12
|\ | | | | | | | | | | | | eb0cfd28 FindXMLRPC: handle QUIETLY and REQUIRED correctly Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !887
| * FindXMLRPC: handle QUIETLY and REQUIRED correctlyNiklas Simons2017-05-251-18/+12
| | | | | | | | | | | | | | Use the built in FindPackageHandleStandardArgs. Fixes: #16912 Signed-off-by: Niklas Simons <nsimons@abo.fi>
* | Merge topic 'FindCygwin-alt-arch'Brad King2017-05-251-2/+2
|\ \ | | | | | | | | | | | | | | | | | | d3034654 FindCygwin: Use find_program instead of find_path Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !883
| * | FindCygwin: Use find_program instead of find_pathTibor Szabo2017-05-231-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cygwin's installation directory is mainly needed to use some programs of it, irrespectively of the target architecture. However, find_path does not consider cygwin with architecture different than the target architecture. This is because cygwin's installation path is retrieved from the registry. WOW64 view is not used by find_path if generating for 32-bit architecture and vice versa, so cygwin is not found then. find_program tries both views, this way a 64-bit cygwin may be used for 32 bit build and vice versa.
* | | Merge topic 'FindDoxygen-add-docs-function'Brad King2017-05-251-124/+997
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 59ffabfe Improve Doxygen support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !684
| * | | Improve Doxygen supportAlex Turbov2017-05-241-124/+997
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Except Graphviz's `dot` Doxygen may use few other utilities like `mscgen` (Message Sequence Chart) and `dia` (Diagram Editor). Now this module allows to manage Doxygen settings from `CMakeLists.txt` and forget about `Doxyfile`s. Also it provides a helper function to add a target to generate documentation: `doxygen_add_docs`. Implement code review notes: - Introduce `COMPONENTS` to find: `dot`, `mscgen` and `dia`; - Deprecate variables `DOXYGEN_SKIP_DOT`, `DOXYGEN_EXECUTABLE`, `DOXYGEN_DOT_EXECUTABLE`, `DOXYGEN_DOT_FOUND` in favour of `doxygen_add_docs ` usage instead; - Properly handle paths to found tools in Windows; - Prevent adding a custom target if Doxygen was not really found; - Introduce exported (executable) targets for found components. Co-Author: Craig Scott <craig.scott@crascit.com>
* | | Merge topic 'find_dependency-improvements'Brad King2017-05-251-29/+9
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | ab358d6a Improve find_dependency argument handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !872
| * | Improve find_dependency argument handlingMatthew Woehlke2017-05-221-29/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove highly specialized and totally positional argument handling in find_dependency macro, and instead just pass arguments through to find_package. This gives users access to the full suite of arguments that find_package knows, and is backward compatible with the old arguments. Also, rewrite the unit tests for this, since the old tests are exclusively focused on testing the old argument handling and are no longer applicable, and add some success tests (the old tests did not even set up the CMake state in a way that CMake had any hope of ever finding the test package).
* | | Merge topic 'vs15-GNUtoMS'Brad King2017-05-241-0/+15
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | abe8a623 GNUtoMS: Add search path for VS 2017 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !875
| * | | GNUtoMS: Add search path for VS 2017 environment scriptsAlex Ghosh2017-05-221-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | Use `cmake_host_system_information` to query the VS Installer tool for the locations of VS versions since VS 2017 does not provide registry entries anymore. Add a loop to simplify addition of future versions.
* | | | Merge topic 'IAR-response-flag-space'Brad King2017-05-242-2/+2
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | 68ea936f Added space after IAR response file flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !880
| * | | Added space after IAR response file flagAndreas Weis2017-05-232-2/+2
| | | | | | | | | | | | | | | | | | | | Without the space between the flag and the filename, IAR will fail to parse the arguments correctly.
* | | | Merge topic 'FindImageMagick-support-v7'Brad King2017-05-231-7/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4131d1b5 FindImageMagick: Update to work with v7 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !874
| * | | | FindImageMagick: Update to work with v7Robert Dailey2017-05-221-7/+16
| |/ / /
* | | | FindProtobuf: Rename imported targets to match upstream namesBrad King2017-05-221-27/+27
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | Rename our recently added imported targets to match those provided by the upstream's CMake-based build. That way a project using `find_package(Protobuf)` can get the same target names no matter how protobuf is found. Suggested-by: Konstantin Podsvirov <konstantin@podsvirov.pro>
* | | Merge topic 'pgi-fix-windows'Brad King2017-05-226-5/+78
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4eb15824 Windows-PGI: Add platform definitions a94ae96e Windows-PGI: Adapt default compiler flags c2c2d366 ImplicitLinkInfo: Add support for PGI on Windows Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !794
| * | | Windows-PGI: Add platform definitionsChristian Pfeiffer2017-05-204-0/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PGI on Windows should use the Visual C++ linker and librarian and not the ar provided for legacy reasons. The compiler parameters themselves are the same as their Linux parameters and not compatible to MSVC however.
| * | | Windows-PGI: Adapt default compiler flagsChristian Pfeiffer2017-05-201-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | PGI demands -Bdynamic (/MD equivalent) for linking together dynamic libraries, so we should make it our default mirroring the settings of e.g. Visual C++ and Intel C++.
| * | | ImplicitLinkInfo: Add support for PGI on WindowsChristian Pfeiffer2017-05-201-4/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Since PGI does not write linker directives into objects, the necessary libraries have to be parsed from commandline. PGI does however link the Visual C++ runtime libraries, so they have to be filtered out to ensure no collision with settings of other languages can occur.
* | | | Merge topic 'UseEcos-update'Brad King2017-05-221-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47732280 UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholders Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !871
| * | | | UseEcos: Fix for separate <DEFINES> and <INCLUDES> placeholdersFlorian Schmaus2017-05-191-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update the module to account for commit v3.4.0-rc1~342^2 (Factor an <INCLUDES> placeholder out of <FLAGS> in rule variables, 2015-07-13) and v2.6.0~537 (Create COMPILE_DEFINITIONS property for targets and source files, 2008-01-14). Fixes: #16904
* | | | Merge topic 'FindProtobuf-targets'Brad King2017-05-191-0/+81
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | 37627217 Help: Add notes for topic 'FindProtobuf-targets' e4e1d194 FindProtobuf: add tests f29635b6 FindProtobuf: add targets Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !861
| * | | FindProtobuf: add targetsAndré Apitzsch2017-05-181-0/+81
| | | |
* | | | Merge topic 'string-append'Brad King2017-05-1813-28/+28
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e24af01 Use string(APPEND) in Modules Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !864
| * | | | Use string(APPEND) in ModulesDaniel Pfeifer2017-05-1713-28/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Automate with: find Modules -type f -print0 | xargs -0 perl -i -0pe \ 's/set\(([a-zA-Z0-9_\$\{\}]+)(\s+)"\$\{\1\}([^"])/string(APPEND \1\2"\3/g'
* | | | Merge topic 'cpack-archive-per-component-filename'Brad King2017-05-181-0/+39
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9e06e97d CPack/Archive: per component filenames support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !859
| * | | | CPack/Archive: per component filenames supportDomen Vrankar2017-05-161-0/+39
| |/ / / | | | | | | | | | | | | | | | | | | | | Support for setting archive packager specific per component filenames and monolithic package filenames.
* | | | Merge topic 'vs14-GNUtoMS'Brad King2017-05-181-0/+2
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | c02d4d2a GNUtoMS: Add search path for VS 2015 environment scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !854
| * | | GNUtoMS: Add search path for VS 2015 environment scriptsAlex Ghosh2017-05-171-0/+2
| | | |
* | | | Merge topic 'gtest_add_tests'Brad King2017-05-181-26/+149
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | | | | | 6edd1806 GoogleTest: Expand capabilities of gtest_add_tests() Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !839
| * | | GoogleTest: Expand capabilities of gtest_add_tests()Craig Scott2017-05-151-26/+149
| | |/ | |/| | | | | | | | | | | | | | | | | | | Now has keyword-based arguments (old syntax form is still supported). Discovered tests can have a prefix and/or suffix added to the test names and the list of discovered tests is available to the caller. The working dir can also be set and the dependency on the source files is now optional instead of mandatory.
* | | Merge topic 'cpackifw-i18n'Brad King2017-05-161-9/+37
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 72ac7ad9 CPackIFW: Internationalization Support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !748
| * | | CPackIFW: Internationalization SupportKonstantin Podsvirov2017-05-121-9/+37
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Changes: - DISPLAY_NAME and DESCRIPTION in CPackIFW module now is MULTI_ARGS; - Added internationalization support for DisplayName and Description properties in cmCPackIFWPackage class; - Added documentation to CPackIFW module; - Added release note.
* | | Merge topic 'extra-fphsa-space'Brad King2017-05-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3c515e19 FPHSA: remove extra space Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !843
| * | | FPHSA: remove extra spaceBen Boeckel2017-05-151-2/+2
| |/ / | | | | | | | | | | | | | | | Each missing variable is added to the string as " ${var}" which causes the string to always have a leading space. Remove the duplicate space due to this in the output.
* | | Merge topic 'GNU-FindBinUtils-patterns'Brad King2017-05-161-2/+10
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 75accaae GCC: more patterns for ar/ranlib Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !838
| * | | GCC: more patterns for ar/ranlibRuslan Baratov2017-05-141-2/+10
| |/ /
* | | Merge topic 'vs_fix_cpp_debugging_with_cs_enabled'Brad King2017-05-161-11/+11
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a6b39a5a VS: Fix debugging of C++ executables if CSharp is enabled Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !844
| * | | VS: Fix debugging of C++ executables if CSharp is enabledMichael Stürmer2017-05-151-11/+11
| | |/ | |/| | | | | | | Fixes: #16867
* | | Merge topic 'FindOpenSSL-crypto-only'Brad King2017-05-161-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8b410453 FindOpenSSL: Restore support for crypto-only result Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !846
| * | | FindOpenSSL: Restore support for crypto-only resultBrad King2017-05-151-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.8.0-rc1~132^2 (FindOpenSSL: Check that both CRYPTO and SSL libraries are present, 2017-01-03) we require both crypto and ssl libraries to be present. This makes sense because `OPENSSL_LIBRARIES` lists both and breaks when one is not found. However, prior to that fix we supported finding only the crypto library and using it through the imported target. Drop the requirement for ssl to restore support for using crypto alone. Later this module should be taught to support the `COMPONENTS` argument of `find_package`. Fixes: #16882
* | | Merge topic 'FindDevIL-compat'Brad King2017-05-161-1/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e8f0385f FindDevIL: Restore IL_FOUND result variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !845
| * | | FindDevIL: Restore IL_FOUND result variableBrad King2017-05-151-1/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.8.0-rc1~257^2~1 (FindDevIL: fail properly when library is not found, 2016-11-24) removed the previously-provided `IL_FOUND` result variable. Set it for compatibility and update the documentation to mention the new variable. Fixes: #16881
| * | Merge branch 'FindMatlab-2017a' into releaseBrad King2017-05-011-0/+1
| |\ \
| * \ \ Merge branch 'FindBoost-backport-fixes' into releaseBrad King2017-04-241-14/+42
| |\ \ \
| | * | | FindBoost: Support prebuilt Windows binaries from SourceForgeRoger Leigh2017-04-241-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This are searched for in the default installed location C:/local/boost_${ver} Cherry picked from commit 862482df274121e6f80dca925fb01d996710ed5e for backport to CMake 3.8.
| | * | | FindBoost: Allow testing for multiple compiler suffixesRoger Leigh2017-04-241-12/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to permit VS2017 to make use of the vc141 suffix or fall back to the compatible vc140 to use Boost libraries built with VS2015. Cherry picked from commit 3ca6f70f8b27c08ad3470542705701e6e8e6ea05 plus a fixup from commit 6115875bf0faef61c558e46395e67bdfd4ad48e1 for backport to CMake 3.8.
| | * | | FindBoost: Fix library directory for VS 2017Brad King2017-04-241-1/+1
| | | | | | | | | | | | | | | | | | | | Boost 1.64 now names the library directory `14.1`, not `15.0`.
| * | | | Merge branch 'cpack-rpm-buildrequires-docs' into releaseBrad King2017-04-201-0/+13
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'FindBoost-fix-backslash-tolerance' into releaseBrad King2017-04-191-2/+3
| |\ \ \ \
generated by cgit v0.12 at 2025-01-24 10:48:35 (GMT)