summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.11.0-rc4v3.11.0-rc4Brad King2018-03-191-1/+1
|
* Merge branch 'revert-findqt4-dirs-fix' into release-3.11Brad King2018-03-191-12/+1
|\ | | | | | | Merge-request: !1867
| * FindQt4: Revert "Set PLUGINS and IMPORTS dir even if empty"Brad King2018-03-191-12/+1
| | | | | | | | | | | | | | | | | | The change in commit v3.11.0-rc1~306^2 (FindQt4: Set PLUGINS and IMPORTS dir even if empty, 2017-11-19) regressed existing builds on some machines. Revert it for CMake 3.11 pending further investigation. Fixes: #17814, #17817 Issue: #14155, #17492
* | Merge branch 'intel-initializer-list' into release-3.11Brad King2018-03-162-5/+7
|\ \ | | | | | | | | | Merge-request: !1855
| * | Features: Record initializer list support for Intel 14 and aboveBrad King2018-03-162-5/+7
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features recorded by commit v3.6.0-rc1~120^2~5 (Features: Record standards and features for Intel C++ on UNIX, 2016-04-28) for the Intel compiler left out initializer list support because our test case in `Tests/CompileFeatures/cxx_generalized_initializers.cpp` caused an internal compiler error. It turns out this is because the Intel compiler asserts the `initializer_list` constructor signatures to verify that they match its own `<initializer_list>` header. It was our dummy implementation used to test the language feature without any headers that caused the ICE. Revise it to use a constructor signature accepted by the Intel compiler. Fixes: #17829
* | Merge branch 'gtest_discover_tests_timeout' into release-3.11Brad King2018-03-1615-16/+145
|\ \ | | | | | | | | | Merge-request: !1851
| * | GoogleTest: Rename TIMEOUT parameter to avoid clashCraig Scott2018-03-1515-16/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In gtest_discover_tests(), the TIMEOUT keyword was making it impossible to set the TIMEOUT test property via the PROPERTIES keyword. This would be a frequent case, but it doesn't complain and instead silently does something different to what would normally be expected. The TIMEOUT keyword has been renamed to DISCOVERY_TIMEOUT, thereby removing the clash. This is a breaking change. 3.10.1 and 3.10.2 were the only versions that supported the TIMEOUT keyword and uses of it were likely not working as intended. Fixes: #17801
* | | Merge branch 'xl-cc-default-std' into release-3.11Brad King2018-03-141-1/+2
|\ \ \ | | | | | | | | | | | | Merge-request: !1854
| * | | XL: Fix C default level detection when invoked as 'cc'Brad King2018-03-141-1/+2
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The IBM XL C compiler does not define `__STDC__` when invoked as plain `cc` instead of `xlc`, so `CMAKE_C_STANDARD_COMPUTED_DEFAULT` does not get set and CMake fails. Teach CMake about the XL compiler's default C standard in this case. Fixes: #17649
* | | Merge branch 'findjni-mips-r6-new-arch' into release-3.11Brad King2018-03-141-1/+4
|\ \ \ | | | | | | | | | | | | Merge-request: !1853
| * | | FindJNI: add some new architecture names for mips release 6YunQiang Su2018-03-141-1/+4
| |/ /
* | | Merge branch 'genex-COMPILE_LANGUAGE-system-include' into release-3.11Brad King2018-03-139-25/+43
|\ \ \ | | | | | | | | | | | | Merge-request: !1844
| * | | Genex: Fix COMPILE_LANGUAGE propagation through try_compileBrad King2018-03-124-17/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When evaluating include directories during export to a `try_compile` test project, thread the compile language through to the generator expression evaluator so it can support `$<COMPILE_LANGUAGE:...>`. Issue: #17811
| * | | Genex: Fix COMPILE_LANGUAGE in SYSTEM include directoriesBrad King2018-03-126-15/+29
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | When evaluating `INTERFACE_SYSTEM_INCLUDE_DIRECTORIES`, or evaluating `INTERFACE_INCLUDE_DIRECTORIES` on an imported target, thread the compile language through to the generator expression evaluator so that it can support `$<COMPILE_LANGUAGE:...>`. Fixes: #17811
* | | Merge branch 'ccmake-stack-smashing' into release-3.11Brad King2018-03-131-1/+1
|\ \ \ | | | | | | | | | | | | Merge-request: !1836
| * | | ccmake: fix status line buffer overflow on very wide terminalsTianhao Chai2018-03-131-1/+1
| | |/ | |/| | | | | | | | | | A mistyped length calculation will memset across stack frame when the user's terminal width is larger than 270.
* | | Merge branch 'ep-support-passing-var-ending-with-notfound' into release-3.11Brad King2018-03-125-6/+36
|\ \ \ | | | | | | | | | | | | Merge-request: !1838
| * | | ExternalProject: Fix cache generation when last args ends with "-NOTFOUND"Jean-Christophe Fillion-Robin2018-03-125-6/+36
| | |/ | |/|
* | | Merge branch 'update-buildsystem-docs' into release-3.11Brad King2018-03-121-6/+5
|\ \ \ | |/ / |/| | | | | Merge-request: !1839
| * | Help: Adapt cmake-buildsystem(7) to new IMPORTED targets featuresKai Wolf2018-03-121-6/+5
|/ / | | | | | | | | | | | | Since commit v3.11.0-rc1~433^2~2 (Teach target_* commands to set INTERFACE properties of IMPORTED targets, 2017-09-18) it is now possible to use the customary `target_*` commands for adjusting the settings of an IMPORTED target. Update documentation accordingly.
* | CMake 3.11.0-rc3v3.11.0-rc3Brad King2018-03-091-1/+1
| |
* | Merge branch 'cuda-no-device-link-rsp' into release-3.11Brad King2018-03-071-0/+6
|\ \ | | | | | | | | | Merge-request: !1831
| * | CUDA: Do not pass unsupported @rspfile arguments to NVCCBrad King2018-03-071-0/+6
| | | | | | | | | | | | | | | | | | | | | The nvcc compiler does not support `@<rspfile>` arguments. It does offer a `--options-file` argument that can be investigated later. Fixes: #17797
* | | Merge branch 'update-kwsys' into release-3.11Brad King2018-03-074-16/+25
|\ \ \ | | | | | | | | | | | | Merge-request: !1830
| * \ \ Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-03-074-16/+25
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-03-07 (2ad561e7)
| | * | | KWSys 2018-03-07 (2ad561e7)KWSys Upstream2018-03-074-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 2ad561e78b0d99f083f1213e403d5a8a90e0e134 (master). Upstream Shortlog ----------------- Brad King (4): 6e190d9a Fix include directory usage requirement for build tree 6d4e9fde SystemInformation: Android has no getifaddrs prior to API 24 0a0974d0 SystemTools: Restore unconditional caching in GetActualCaseForPath a241fd13 SystemTools: Remove caching from public GetActualCaseForPath
* | | | | Merge branch 'autogen-empty-source-file-fix' into release-3.11Brad King2018-03-061-11/+18
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | Merge-request: !1825
| * | | | | Autogen: Check if a file is empty before reading itSebastian Holtermann2018-03-061-11/+18
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Calling `std::string::front()` on an empty string results in an undefined behavior by the C++ standard. In gcc8 it causes an assertion to fail. This adds a check to `AUTOGEN` if a file to read is empty and in case avoids the use of an empty `std::string` buffer. Closes #17793
* | | | | Merge branch 'xl-new-compiler-macros' into release-3.11Brad King2018-03-064-10/+26
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Merge-request: !1820
| * | | | XL: Recognize compilers identified by __ibmxl__Brad King2018-03-064-10/+26
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IBM XL C/C++ for Linux versions 13.1.6 and above no longer define `__IBMC__` or `__IBMCPP__` by default (see `-qxlcompatmacros`). Instead `__ibmxl__` now identifies the compiler along with some related new version macros. Fixes: #17784
* | | | CMake 3.11.0-rc2v3.11.0-rc2Brad King2018-02-271-1/+1
| | | |
* | | | Merge branch 'modules-restore-path-suffixes' into release-3.11Brad King2018-02-264-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1802
| * | | | Modules: Restore recently removed search path suffixesBrad King2018-02-264-0/+11
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.11.0-rc1~293^2~4 (Modules: Remove paths set as global Unix prefixes, 2017-11-20) removed `PATH_SUFFIXES` options that appeared to be used to cover subdirectories of the `PATHS` options that were also removed. However, the path suffixes also apply to other search paths and so should not be removed. Restore them. Fixes: #17760
* | | | Merge branch 'unixtimefix' into release-3.11Brad King2018-02-262-4/+4
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1800
| * | | | Tests: Fix TIMESTAMP-UnixTime test under SOURCE_DATE_EPOCH=1Bernhard M. Wiedemann2018-02-262-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test was expecting timestamps on day 1 in 1970 to start at 86400 but they actually started at 0. This worked without `SOURCE_DATE_EPOCH=1` because after 1972, leap days compensated the offset. Fixes: #17762
* | | | Merge branch '14297-partial-xcode-zero-check' into release-3.11Brad King2018-02-235-1/+26
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1790
| * | | | Xcode: Generate ZERO_CHECK generator target only onceGregor Jasny2018-02-225-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In case CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY has been enabled generate only the root-level ZERO_CHECK target so targets in subdirectories pick up the root generator target of ZERO_CHECK. For the case that CMAKE_XCODE_GENERATE_TOP_LEVEL_PROJECT_ONLY is not enabled more investigation and a proper and final fix is still needed. Issue: 14297
* | | | | Merge branch 'std-thread-link' into release-3.11Brad King2018-02-222-0/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | Merge-request: !1789
| * | | | CMakeLib: Link to system thread libraries to support std::threadBrad King2018-02-222-0/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some environments require linking to thread libraries for `std::thread`. Express this direct dependency of CMakeLib explicitly. Previously this was done indirectly through our bundled libuv, but that does not work when using a system libuv. Fixes: #17757
* | | | Merge branch 'test-CompileFeatures-c11-range' into release-3.11Brad King2018-02-211-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1785
| * | | | Tests: Make CompileFeatures C dialect check consistent with implBrad King2018-02-211-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | `Modules/CMakeCCompilerId.c.in` will report the C dialect as 11 whenever `__STDC_VERSION__` indicates *at least* C 11. Make the test consistent with this. We already do this for the C++ case. Fixes: #17740
* | | | Merge branch 'autogen-depend-filters-documentation' into release-3.11Brad King2018-02-212-26/+99
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1782
| * | | | Autogen: Doc: Extend AUTOMOC_DEPEND_FILTERS documentationSebastian Holtermann2018-02-211-18/+77
| | | | |
| * | | | Autogen: Doc: Extend AUTOGEN_TARGET_DEPENDS documentationSebastian Holtermann2018-02-211-8/+22
| |/ / /
* | | | Merge branch 'ti-depfile-flag-fix' into release-3.11Brad King2018-02-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1774
| * | | | Compiler/TI: Fix depfile generation for C++Grzegorz Dobinski2018-02-201-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.11.0-rc1~466^2 (Compiler/TI: Add support for depfile generation for Ninja, 2017-10-16) the flag for C++ was added in a variable with a typo in its name. Fix the spelling. Issue: #17360
* | | | Merge branch 'help_fixup' into release-3.11Brad King2018-02-162-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1770
| * | | | Help: Fix command references in CMAKE_NETRC* variable documentationShane Parris2018-02-162-2/+2
| |/ / /
* | | | Merge branch 'export-android-mk' into release-3.11v3.11.0-rc1Brad King2018-02-152-13/+17
|\ \ \ \ | | | | | | | | | | | | | | | Merge-request: !1766
| * | | | Android.mk: Fix export of static libraries with PRIVATE dependenciesBrad King2018-02-142-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `LINK_ONLY` generator expression is used to represent private dependencies of static libraries in their `INTERFACE_LINK_LIBRARIES` property value. Fix evaluation of generator expressions during export to support the `LINK_ONLY` genex. Extend the RunCMake.AndroidMK test with a case for this.
View Lorry Controller Status