summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'reduce-string-copying'Brad King2017-05-2842-129/+130
|\ | | | | | | | | | | | | | | | | | | | | 2c2bb5f5 Remove unnecessary operator<< usage 1e4e2f99 Remove unused variables 25486156 Improved checking for number of arguments passed 86dc86dd Add const-reference qualifications 76bdb407 Change std::basic_string<char> to std::string Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !886
| * Remove unnecessary operator<< usagePavel Solodovnikov2017-05-261-1/+1
| |
| * Remove unused variablesPavel Solodovnikov2017-05-263-7/+1
| |
| * Improved checking for number of arguments passedPavel Solodovnikov2017-05-261-1/+1
| |
| * Add const-reference qualificationsPavel Solodovnikov2017-05-2639-114/+121
| |
| * Change std::basic_string<char> to std::stringPavel Solodovnikov2017-05-241-6/+6
| |
* | Merge topic 'FindBoost-use-IN_LIST'Brad King2017-05-281-6/+10
|\ \ | | | | | | | | | | | | | | | | | | cc329a01 FindBoost: Simplify search in lists. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !750
| * | FindBoost: Simplify search in lists.Alex Turbov2017-05-261-6/+10
| | | | | | | | | | | | | | | | | | Instead of `list(FIND...)` and then checking result for `-1` (found/not-found), nowadays `if` command has the `IN_LIST` test for that.
* | | Merge topic 'autogen_config'Brad King2017-05-2811-243/+424
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e3e692ca Autogen: Test adaptions dbda5906 Autogen: Per-config file suffixes. New AUTOGEN_BUILD_DIR target property. 0965002e Autogen: Pass build directory in Info file Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !858
| * | | Autogen: Test adaptionsSebastian Holtermann2017-05-261-2/+8
| | | |
| * | | Autogen: Per-config file suffixes. New AUTOGEN_BUILD_DIR target property.Sebastian Holtermann2017-05-2611-231/+403
| | | | | | | | | | | | | | | | | | | | Closes #14760 Closes #14313
| * | | Autogen: Pass build directory in Info fileSebastian Holtermann2017-05-264-22/+25
| | | |
* | | | Merge topic 'FindProtobuf-export-macro'Brad King2017-05-282-5/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ee20192 FindProtobuf: add optional export declaration macro to generated cpp files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !881
| * | | | FindProtobuf: add optional export declaration macro to generated cpp filesAndré Apitzsch2017-05-262-5/+22
| | | | |
* | | | | Merge topic 'update-libuv'Brad King2017-05-2821-96/+724
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 478ce1c7 libuv: Update build within CMake 1ebb421b Merge branch 'upstream-libuv' into update-libuv 362435f0 libuv 2017-05-25 (dc596109) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !896
| * | | | | libuv: Update build within CMakeBrad King2017-05-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Update our CMake build rules to account for upstream changes.
| * | | | | Merge branch 'upstream-libuv' into update-libuvBrad King2017-05-2620-96/+720
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | * upstream-libuv: libuv 2017-05-25 (dc596109)
| | * | | | libuv 2017-05-25 (dc596109)libuv upstream2017-05-2620-96/+720
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://github.com/libuv/libuv.git at commit dc596109d5a22db1dbf57098630eebd30fce8068 (v1.x).
* | | | | | CMake Nightly Date StampKitware Robot2017-05-281-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2017-05-271-1/+1
|/ / / / /
* | | | | Merge topic 'codecvt-revise'Brad King2017-05-263-141/+177
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 690acadc codecvt: Re-implement do_out and do_unshift Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !891
| * | | | | codecvt: Re-implement do_out and do_unshiftBrad King2017-05-253-141/+177
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous implementation assumed that only one byte would be given in the `from` buffer by the caller at a time. This may be true for MSVC but is not for the GNU library on Windows. Re-implement these methods to handle more than one byte per call. Also simplify the state management by keeping all state between calls directly in the `mbstate_t` argument instead of using it to index our own heap-allocated state. Fixes: #16893
* | | | | | 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 'cpacklog-string-cref'Brad King2017-05-261-6/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 542d9d5e cmCPackLog: pass std::string by const& Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !892
| * | | | | | cmCPackLog: pass std::string by const&Daniel Pfeifer2017-05-251-6/+6
| | | | | | |
* | | | | | | Merge topic 'vs-vcxproj-indent'Brad King2017-05-261-12/+12
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30675ec4 VS: Fix indentation of .vcxproj files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !884
| * | | | | | | VS: Fix indentation of .vcxproj filesBrad King2017-05-241-12/+12
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Patch-by: vvs31415 on gitlab.kitware.com
* | | | | | | 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.