summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-kwsys'Brad King2017-05-263-53/+75
|\ | | | | | | | | | | | | | | 867b1742 Merge branch 'upstream-KWSys' into update-kwsys 402c6c12 KWSys 2017-05-25 (160bed45) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !890
| * Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-253-53/+75
| |\ | | | | | | | | | | | | * upstream-KWSys: KWSys 2017-05-25 (160bed45)
| | * KWSys 2017-05-25 (160bed45)KWSys Upstream2017-05-253-53/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 160bed451833380e9f6ddc60e709ab6800bf2129 (master). Upstream Shortlog ----------------- Brad King (1): 51859eab CONTRIBUTING: Specify clang-format version used for code style Florian Maushart (2): 684bcda6 SystemInformation: Expose CPU feature flags publicly 70b8332f SystemInformation: Add CPU_FEATURE_FPU flag
* | | CMake Nightly Date StampKitware Robot2017-05-261-1/+1
| | |
* | | Merge topic 'c++11-iwyu-decay-and-strip'Brad King2017-05-251-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 60afab9e IWYU: add mapping for std::__decay_and_strip Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !889
| * | | IWYU: add mapping for std::__decay_and_stripDaniel Pfeifer2017-05-241-0/+13
| | | |
* | | | 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-258-124/+1116
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 59ffabfe Improve Doxygen support Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !684
| * | | | | Improve Doxygen supportAlex Turbov2017-05-248-124/+1116
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'server-fix-warning'Brad King2017-05-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa7e9a96 cmServer: Fix compiler -Wdouble-promotion warning Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !885
| * | | | | cmServer: Fix compiler -Wdouble-promotion warningBrad King2017-05-241-1/+1
| | |/ / / | |/| | |
* | | | | Merge topic 'find_dependency-improvements'Brad King2017-05-2529-79/+80
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab358d6a Improve find_dependency argument handling Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !872
| * | | | | Improve find_dependency argument handlingMatthew Woehlke2017-05-2229-79/+80
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'find_package-shorter-message'Brad King2017-05-2510-137/+109
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0b9d1cc find_package: shorten output for missing package in config mode d9df805f cmFindPackageCommand: Split condition to improve readability Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !851
| * | | | | find_package: shorten output for missing package in config modeChristoph Grüninger2017-05-2310-49/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If CONFIG or MODULE is given and the package is not REQUIRED, output a one-liner instead of the full warning. Update Tests/RunCMake/find_package expected output to match.
| * | | | | cmFindPackageCommand: Split condition to improve readabilityChristoph Grüninger2017-05-231-91/+97
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-05-251-1/+1
| |_|/ / / |/| | | |
* | | | | Merge branch 'release'Brad King2017-05-240-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'vs15-GNUtoMS' into releaseBrad King2017-05-221-0/+15
| |\ \ \ \ \
* | \ \ \ \ \ 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 'update-kwsys'Brad King2017-05-241-4/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6f334159 Merge branch 'upstream-KWSys' into update-kwsys 47a8ff34 KWSys 2017-05-23 (411e958f) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !882
| * \ \ \ \ \ \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2017-05-231-4/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | / | | | |_|_|_|_|/ | | |/| | | | | * upstream-KWSys: KWSys 2017-05-23 (411e958f)
| | * | | | | | KWSys 2017-05-23 (411e958f)KWSys Upstream2017-05-231-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 411e958f46246eaf8e044b6d0af542685bca5fcf (master). Upstream Shortlog ----------------- Brad King (1): c23e388b ConsoleBuf: Avoid signed/unsigned comparison
* | | | | | | | CMake Nightly Date StampKitware Robot2017-05-241-1/+1
|/ / / / / / /
* | | | | | | Merge topic 'vs-reduce-UseOfMfc'Brad King2017-05-231-10/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b520b18c VS: Write UseOfMfc tag only if CMAKE_MFC_FLAG is present Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !873
| * | | | | | | VS: Write UseOfMfc tag only if CMAKE_MFC_FLAG is presentBrad King2017-05-221-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't bother writing `UseOfMfc` to `.vcxproj` files when the value is just the default of `0`. This keeps the files cleaner. Patch-by: vvs31415 on gitlab.kitware.com
* | | | | | | | Merge topic 'darwin-bootstrap'Brad King2017-05-231-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4edcc375 bootstrap: prefer Clang over GNU on Darwin Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !878
| * | | | | | | | bootstrap: prefer Clang over GNU on DarwinDaniel Pfeifer2017-05-221-1/+1
| |/ / / / / / /
* | | | | | | | 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
| |/ / / / / / /
* | | | | | | | Merge topic 'FindProtobuf-targets'Brad King2017-05-232-30/+30
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a5ccddf0 FindProtobuf: Rename imported targets to match upstream names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !876
| * | | | | | | FindProtobuf: Rename imported targets to match upstream namesBrad King2017-05-222-30/+30
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | | | | | CMake Nightly Date StampKitware Robot2017-05-231-1/+1
|/ / / / / /
* | | | | | Merge branch 'release'Brad King2017-05-220-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | |
| * | | | | Merge branch 'vs14-GNUtoMS' into releaseBrad King2017-05-171-0/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| * | | | | Merge branch 'source_group-TREE-relative-path' into releaseBrad King2017-05-176-23/+39
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'add-findpackage-root-prefix'Brad King2017-05-2230-18/+581
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe8f08d2 find_*: Add docs for PackageRoot search path group 57744ca9 find_*: Add tests for PackageRoot search path group ef3d360a find_*: Add a new PackageRoot search path group Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !796
| * | | | | | | find_*: Add docs for PackageRoot search path groupChuck Atkins2017-05-197-16/+58
| | | | | | | |
| * | | | | | | find_*: Add tests for PackageRoot search path groupChuck Atkins2017-05-1617-0/+476
| | | | | | | |
| * | | | | | | find_*: Add a new PackageRoot search path groupChuck Atkins2017-05-166-2/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new PackageRoot search path group allows the PackageName_ROOT cmake and environment variables to be used as search prefixes for all find_* commands called from within a find module
* | | | | | | | Merge topic 'pgi-fix-windows'Brad King2017-05-227-8/+126
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-202-7/+61
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
generated by cgit v0.12 at 2025-01-20 23:15:00 (GMT)