summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Check*: Added include guardsCristian Adam2017-12-0121-3/+36
|
* Merge branch 'release-3.10'Brad King2017-11-270-0/+0
|\
| * Merge branch 'gtest-fix-discovery' into release-3.10Brad King2017-11-215-5/+67
| |\ | | | | | | | | | Merge-request: !1510
* | \ Merge topic 'extend-compile-language-genex'Brad King2017-11-2724-73/+86
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2ae880fa Genex: Enable COMPILE_LANGUAGE for COMPILE_OPTIONS with Visual Studio 2b7d59f3 Genex: Enable COMPILE_LANGUAGE for file(GENERATE) with Visual Studio 0f6f7c8a Genex: Fix COMPILE_LANGUAGE messages to allow file(GENERATE) with Xcode c5a82d0f Tests: Decouple COMPILE_LANGUAGE in file(GENERATE) from COMPILE_OPTIONS 25773650 Tests: Remove unnecessary result files from RunCMake.File_Generate Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jason Juang <jasjuang@gmail.com> Merge-request: !1511
| * | | Genex: Enable COMPILE_LANGUAGE for COMPILE_OPTIONS with Visual StudioBrad King2017-11-2014-45/+65
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.9.0-rc4~3^2~1 (VS: Fix target_compile_options for CUDA, 2017-06-21), the evaluation of `COMPILE_LANGUAGE` receives the proper language. The set of compile flags used for a target's C and C++ sources is based on the linker language. By default this is always the C++ flags if any C++ sources appear in the target, and otherwise the C flags. Therefore we can define the `COMPILE_LANGUAGE` generator expression in `COMPILE_OPTIONS` to match the selected language. This is not exactly the same as for other generators, but is the best VS can do. It is also sufficient for many use cases since the set of allowed flags for C and C++ is almost the same in Visual Studio. Furthermore, since the VS generator moves many of the flags to declarative `.vcxproj` elements, it will automatically avoid passing C++ flags for C sources. Issue: #17435
| * | | Genex: Enable COMPILE_LANGUAGE for file(GENERATE) with Visual StudioBrad King2017-11-175-18/+23
| | | | | | | | | | | | | | | | Issue: #17435
| * | | Genex: Fix COMPILE_LANGUAGE messages to allow file(GENERATE) with XcodeBrad King2017-11-173-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When rejecting the `COMPILE_LANGUAGE` generator expression on include directories and compile definitions with Xcode, add `file(GENERATE)` to the allowed set in the message. It is allowed and already covered by the `RunCMake.File_Generate` test `COMPILE_LANGUAGE-genex` case.
| * | | Tests: Decouple COMPILE_LANGUAGE in file(GENERATE) from COMPILE_OPTIONSBrad King2017-11-171-7/+1
| | | | | | | | | | | | | | | | | | | | Simplify the `RunCMake.File_Generate` test `COMPILE_LANGUAGE-genex` case to avoid requiring support for the genex in `COMPILE_OPTIONS`.
| * | | Tests: Remove unnecessary result files from RunCMake.File_GenerateBrad King2017-11-176-6/+0
| | | | | | | | | | | | | | | | The default result is "0" anyway.
* | | | Merge topic 'hardcoded-path-removal'Brad King2017-11-2726-274/+94
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a62d50ec Modules: Replace coded PATHS with PATH_SUFFIXES fd56d6a8 FindMPEG,2: Update to current libmpeg2 behavior 5f382cd8 FindPike: Update names and paths 6720807d FindAVIFile: Replace PATHS with updated suffixes f88ef9a9 Modules: Remove paths set as global Unix prefixes Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1502
| * | | | Modules: Replace coded PATHS with PATH_SUFFIXESChristian Pfeiffer2017-11-209-109/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some modules assume that `/usr` and `/usr/local` are the only `CMAKE_PREFIX_PATH` entries and explicitly enumerate all paths instead of using `PATH_SUFFIXES` and relying on the dynamic set of prefix paths. This commit attempts to rectify that behavior.
| * | | | FindMPEG,2: Update to current libmpeg2 behaviorChristian Pfeiffer2017-11-202-23/+17
| | | | |
| * | | | FindPike: Update names and pathsChristian Pfeiffer2017-11-201-6/+3
| | | | |
| * | | | FindAVIFile: Replace PATHS with updated suffixesChristian Pfeiffer2017-11-201-8/+2
| | | | |
| * | | | Modules: Remove paths set as global Unix prefixesChristian Pfeiffer2017-11-2013-128/+8
| | | | | | | | | | | | | | | | | | | | | | | | | This commit removes hardcoded paths that are already given in the platform files or in `UnixPath` on a global level.
* | | | | Merge topic 'iwyu-workaround'Brad King2017-11-271-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e5fdbcc9 IWYU: Add more mappings for std::__decay_and_strip Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1516
| * | | | | IWYU: Add more mappings for std::__decay_and_stripBrad King2017-11-211-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IWYU incorrectly classifies this internal STL type as not internal, and suggests including `<type_traits>` for it. Work around the problem by mapping the offending names to a file that we always include. See include-what-you-use issue 434.
* | | | | | Merge topic 'server-target-isGeneratorProvided'Brad King2017-11-2713-33/+55
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afd9a339 server: return whether or not a target is generator provided Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1475
| * | | | | | server: return whether or not a target is generator providedJustin Goshi2017-11-2013-33/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some generators auto-generate targets. For example VS generators create the ALL_BUILD target. Add the ability to mark targets as generator provided and return that info through cmake-server codemodel.
* | | | | | | Merge topic 'serverFixTestDiscovery'Brad King2017-11-277-103/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fe2c2b0f server: ctestInfo fix to return all tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1479
| * | | | | | | server: ctestInfo fix to return all testsJustin Goshi2017-11-177-103/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prior to this change we were looking at targets. But tests are associated with directories. This change fixes how we gather all tests.
* | | | | | | | CMake Nightly Date StampKitware Robot2017-11-271-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-11-261-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-11-251-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-11-241-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2017-11-231-1/+1
| | | | | | | |
* | | | | | | | Merge topic 'WriteBasicConfigVersionFile_SameMinorVersion'Craig Scott2017-11-225-13/+147
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d18ff3a5 WriteBasicConfigVersionFile: Fix messages in ExactVersion tests 16a93de0 WriteBasicConfigVersionFile: Add SameMinorVersion COMPATIBILITY option Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Claudio <claudio.fantacci@gmail.com> Merge-request: !1507
| * | | | | | | | WriteBasicConfigVersionFile: Fix messages in ExactVersion testsDaniele E. Domenichelli2017-11-211-6/+6
| | | | | | | | |
| * | | | | | | | WriteBasicConfigVersionFile: Add SameMinorVersion COMPATIBILITY optionDaniele E. Domenichelli2017-11-215-7/+141
| | | | | | | | |
* | | | | | | | | CMake Nightly Date StampKitware Robot2017-11-221-1/+1
| |_|_|/ / / / / |/| | | | | | |
* | | | | | | | Merge topic 'gtest-fix-discovery'Brad King2017-11-215-5/+67
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70f9f62d GoogleTest: Fix multiple discovery on same target Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1510
| * | | | | | | GoogleTest: Fix multiple discovery on same targetMatthew Woehlke2017-11-215-5/+67
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | According to the documentation, tests can be discovered for a target multiple times by using a different prefix and/or suffix to ensure name uniqueness. However, while this worked for gtest_add_tests, it did not work with gtest_discover_tests because the generated file that sets up the tests was named based only on the target name, and so subsequent discovery from the same target would clobber earlier discovery. Fix this by introducing a counter that records how many times discovery has been used on a target, and use this to generate unique names of the generated test list files.
* | | | | | | Merge topic 'irsl-intel-1041-folder'Christian Pfeiffer2017-11-211-1/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8e7e7af5 IRSL: Install the 1041 folder for Intel compilers Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1509
| * | | | | | | IRSL: Install the 1041 folder for Intel compilersChristian Pfeiffer2017-11-201-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The presence of the `1041` seems to solely depend on whether a given Intel compiler release was available in Japanese or not. Install it if it is present and silently ignore it otherwise. Example: The Intel 2018.0 release did not ship it, but the 2018.1 compilers have it.
* | | | | | | | Merge topic 'findqt4-dirs-fix'Christian Pfeiffer2017-11-211-1/+12
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f81d186b FindQt4: Set PLUGINS and IMPORTS dir even if empty Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1503
| * | | | | | | | FindQt4: Set PLUGINS and IMPORTS dir even if emptyChristian Pfeiffer2017-11-191-1/+12
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #14155 Issue: #17492
* | | | | | | | Merge topic 'wxwidgets-env-variables'Christian Pfeiffer2017-11-212-4/+6
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9b503cc8 wxWidgets: Respect WX_CONFIG and WXRC_CMD env vars Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1504
| * | | | | | | | wxWidgets: Respect WX_CONFIG and WXRC_CMD env varsChristian Pfeiffer2017-11-192-4/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Issue: #17492
* | | | | | | | Merge topic 'imagemagick-6-freebsd-names'Christian Pfeiffer2017-11-211-0/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35b8a26b FindImageMagick: Add more library names Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1505
| * | | | | | | | FindImageMagick: Add more library namesChristian Pfeiffer2017-11-201-0/+9
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The port maintainers on FreeBSD normalize the library names to not include the bit and HDRI options. Furthermore, `--quantum-depth=32` and `--quantum-depth=64` will yield `Q32` and `Q64` suffixes in the library names. Issue: #17492
* | | | | | | | CMake Nightly Date StampKitware Robot2017-11-211-1/+1
| |_|_|_|_|/ / |/| | | | | |
* | | | | | | Merge topic 'tidy-sha1-comment'Brad King2017-11-201-1/+6
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08353542 clang-tidy: Clarify comment explaining purpose of CLANG_TIDY_SHA1 Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1497
| * | | | | | | clang-tidy: Clarify comment explaining purpose of CLANG_TIDY_SHA1Brad King2017-11-171-1/+6
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | Suggested-by: Bill Hoffman <bill.hoffman@kitware.com>
* | | | | | | Merge branch 'release-3.10'Brad King2017-11-200-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | CMake 3.10.0v3.10.0Brad King2017-11-201-1/+1
| | | | | | |
* | | | | | | Merge branch 'release-3.10'Brad King2017-11-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge branch 'fix-cmake-server-bad-buffering' into release-3.10Brad King2017-11-201-3/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !1498
* | \ \ \ \ \ \ Merge topic 'fix-cmake-server-bad-buffering'Brad King2017-11-201-3/+2
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01c42155 server: Fix regression in partial message handling Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: jdavidberger <j.david.berger@gmail.com> Merge-request: !1498
| * | | | | | | server: Fix regression in partial message handlingvector-of-bool2017-11-201-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a partial message is flushed into the input pipe for CMake Server, the parser will try and parse it as a full message because of some bad loop checks. This was introduced accidentally in commit v3.10.0-rc1~365^2~2 (server: Refactor to make the event loop owned by server object, 2017-03-24).
* | | | | | | | Merge topic 'autogen-rcc-custom-command'Brad King2017-11-2017-1665/+2015
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 40434631 Autogen: Use integers instead of strings for the Qt version be11a852 Autogen: Use project relative paths in rcc custom command comment ab9d5896 Autogen: Detect rcc feature once during configuration 2a85b5ac Autogen: Make cmQtAutoGeneratorInitializer an instantiable class 75819b86 Autogen: Add and use cmQtAutoGenerator base class 27ed3b35 Autogen: Rename cmQtAutoGenerators to cmQtAutoGeneratorMocUic 1cd285fe Autogen: Remove rcc code from cmQtAutoGenerators a87f82e0 Autogen: Switch to use custom commands for RCC ... Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1494