summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Tests: Add test for cmake --build . --target packageKyle Edwards2018-07-173-8/+25
|
* Tests: Add test for install(SCRIPT ... COMPONENT)Kyle Edwards2018-07-175-0/+9
|
* Tests: Add test for InstallRequiredSystemLibrariesKyle Edwards2018-07-173-0/+12
|
* Tests: Add test for $<0:...> in ExportImportKyle Edwards2018-07-171-3/+3
| | | | | This test case already includes test cases for $<1...> and $<0...>, but this commit adds a few $<0:...>'s in cases where it was missing.
* Tests: Add test for install(TARGETS) RPATH functionalityKyle Edwards2018-07-175-1/+42
|
* Tests: Add test for install(FILES) with PERMISSIONSKyle Edwards2018-07-173-0/+7
|
* Tests: Add test for installing parts of targets in different directoriesKyle Edwards2018-07-174-0/+15
|
* Tests: Add test for install(DIRECTORY) with PATTERN and REGEXKyle Edwards2018-07-176-0/+38
|
* Tests: Add test for CONFIGURATIONS parameter of install()Kyle Edwards2018-07-173-0/+4
|
* Tests: Add test for install(<SCRIPT|CODE>)Kyle Edwards2018-07-174-0/+11
|
* Tests: Add test for <PRE|POST>_INSTALL_SCRIPTKyle Edwards2018-07-175-0/+11
|
* Tests: Add test for deprecated install_*() commandsKyle Edwards2018-07-175-0/+19
|
* Tests: Add tests for *OUTPUT_NAME propertiesKyle Edwards2018-07-173-0/+44
|
* Tests: Add test for install(DIRECTORY ... OPTIONAL)Kyle Edwards2018-07-173-0/+3
|
* Tests: Add tests for install(<TARGETS|FILES> ... OPTIONAL)Kyle Edwards2018-07-176-0/+10
|
* Merge branch 'release-3.12'Brad King2018-07-170-0/+0
|\
| * CMake 3.12.0v3.12.0Brad King2018-07-171-1/+1
| |
* | Merge topic 'math-err'Brad King2018-07-1712-92/+104
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 406f397e8b math: Restore toleration of unexpected characters in an expression dd5c54600b cmExprParserHelper: Simplify error state tracking 185bcface4 cmExprParserHelper: Remove some unused code Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2218
| * | math: Restore toleration of unexpected characters in an expressionBrad King2018-07-1612-76/+102
| | | | | | | | | | | | | | | | | | | | | | | | Prior to commit 7c4c13ffef (math: Reject unexpected expression input explicitly, 2018-05-18) we ignored unexpected characters in an expression that otherwise can be parsed. In order to preserve compatibility with projects that accidentally used this, convert the error to a warning.
| * | cmExprParserHelper: Simplify error state trackingBrad King2018-07-161-6/+2
| | | | | | | | | | | | | | | | | | Errors always have explanation strings, so use the presence of such a string to track whether an error has occurred. This avoids an extra variable.
| * | cmExprParserHelper: Remove some unused codeBrad King2018-07-162-10/+0
| | |
* | | Merge topic 'FindProtobuf-upstream-impl'Brad King2018-07-171-99/+143
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 71d99e156b Protobuf: restore previous output directory 2ae2d0bd3e Protobuf: restore 'DESCRIPTORS' support 1385b4b113 Protobuf: restore 'PROTOBUF_IMPORT_DIRS' check 1bcc0f3678 Protobuf: use upstream implementation to generate cpp and python files Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2212
| * | | Protobuf: restore previous output directoryAndré Apitzsch2018-07-161-2/+2
| | | | | | | | | | | | | | | | | | | | The protobuf upstream implementation has a different default output directory. Restore our original output directory for compatibility.
| * | | Protobuf: restore 'DESCRIPTORS' supportAndré Apitzsch2018-07-161-4/+23
| | | | | | | | | | | | | | | | This was not present in the upstream code.
| * | | Protobuf: restore 'PROTOBUF_IMPORT_DIRS' checkAndré Apitzsch2018-07-161-0/+8
| | | | | | | | | | | | | | | | This was not present in the upstream code.
| * | | Protobuf: use upstream implementation to generate cpp and python filesAndré Apitzsch2018-07-161-104/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Generate functions are taken from [1] and [2]. The license [3] is already covered by our BSD-3 license for CMake and our inclusion of "Google Inc" in `Copyright.txt`. [1] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-config.cmake.in [2] https://github.com/google/protobuf/blob/93f6b67e/cmake/protobuf-module.cmake.in [3] https://github.com/google/protobuf/blob/93f6b67e/LICENSE
* | | | Merge topic 'hex_file'Brad King2018-07-171-8/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f431789a9 Use isxdigit() to determine if a character is a hex digit Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2213
| * | | | Use isxdigit() to determine if a character is a hex digitDevin Nakamura2018-07-131-8/+2
| | | | | | | | | | | | | | | | | | | | Replace custom cm_IsHexChar with isxdigit from the stdlib
* | | | | Merge topic 'FindOpenCL-arch-paths'Brad King2018-07-171-10/+21
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dee7bafb13 FindOpenCL: Search per-architecture path suffixes on UNIX Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2215
| * | | | | FindOpenCL: Search per-architecture path suffixes on UNIXAnton Myagkov2018-07-161-10/+21
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Use different path suffixes to find opencl for x86 and x86_64. We already do this on Windows.
* | | | | CMake Nightly Date StampKitware Robot2018-07-171-1/+1
| |_|/ / |/| | |
* | | | Merge branch 'release-3.12'Brad King2018-07-160-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge branch 'doc-add_library-IMPORTED_OBJECTS' into release-3.12Brad King2018-07-161-2/+5
| |\ \ \ | | | | | | | | | | | | | | | Merge-request: !2216
* | \ \ \ Merge topic 'doc-add_library-IMPORTED_OBJECTS'Brad King2018-07-161-2/+5
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | 62b4df1e84 Help: Mention IMPORTED_OBJECTS in add_library docs Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2216
| * | | | Help: Mention IMPORTED_OBJECTS in add_library docsBrad King2018-07-161-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `IMPORTED_OBJECTS` is to object libraries as `IMPORTED_LOCATION` is to normal libraries. Fixes: #18176
* | | | | Merge topic 'FindXercesC-versioned-names'Brad King2018-07-161-2/+9
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82f39c9ce9 FindXercesC: Search for version-named library files Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Roger Leigh <rleigh@codelibre.net> Merge-request: !2210
| * | | | FindXercesC: Search for version-named library filesRaul Metsma2018-07-131-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the version number extracted from the header file to construct versioned library names. This approach is already used by `FindXalanC`. Signed-off-by: Raul Metsma <raul@metsma.ee>
* | | | | CMake Nightly Date StampKitware Robot2018-07-161-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-07-151-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2018-07-141-1/+1
| | | | |
* | | | | Merge topic 'autogen_forward_errors'Brad King2018-07-135-226/+348
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86b332c25d Return std::string from cmGeneratorTarget::ImportedGetLocation 189f723509 Autogen: Wrap moc/uic/rcc related variables in structs c6a8002827 Autogen: Improve error detection during configuration Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2207
| * | | | | Return std::string from cmGeneratorTarget::ImportedGetLocationSebastian Holtermann2018-07-113-13/+6
| | | | | |
| * | | | | Autogen: Wrap moc/uic/rcc related variables in structsSebastian Holtermann2018-07-112-109/+120
| | | | | |
| * | | | | Autogen: Improve error detection during configurationSebastian Holtermann2018-07-113-121/+239
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cmQtAutoGenInitializer::InitCustomTargets and cmQtAutoGenInitializer::SetupCustomTargets now return their success value which gets evaluated and passed on by the caller (cmGlobalGenerator). Checks for the existance of the moc/uic/rcc binaries have been introduces in cmQtAutoGenInitializer. Additionally they get called once with a "-h" argument to determine if they're functional. This way any binary-not-found problem is caught during the configuration phase.
* | | | | | Merge topic 'cpack-wix-extra-sources'Brad King2018-07-131-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f2134169f6 WiX: Add the build directory to IncludeSearchPaths for candle.exe Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2194
| * | | | | | WiX: Add the build directory to IncludeSearchPaths for candle.exeLars Schmertmann2018-07-121-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CPack creates cpack_variables.wxi in the build directory. In the WiX template it can be used by <?include "cpack_variables.wxi"?> because the template is configured into main.wxs in the build directory. Because the extra source files are in the source directory it was necessary to use <?include "$(sys.CURRENTDIR)_CPack_Packages\win32\WIX\cpack_variables.wxi"?>. This requires knowledge about the build directory structure and is avoided by this change by adding the build directory to the IncludeSearchPaths.
* | | | | | | Merge branch 'release-3.12'Brad King2018-07-130-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge branch 'intel-std-fix' into release-3.12Brad King2018-07-122-8/+10
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2206
| * \ \ \ \ \ \ Merge branch 'boost-1.68-beta1' into release-3.12Brad King2018-07-121-4/+23
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge-request: !2204
* | \ \ \ \ \ \ \ Merge topic 'intel-std-fix'Brad King2018-07-132-8/+10
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 735e69f445 Intel: Fix incorrectly documented extension flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2206