Commit Graph

39125 Commits

Author SHA1 Message Date
Brad King 6723261931 Merge branch 'release-3.11' 2018-03-15 07:53:35 -04:00
Brad King bd64d60194 Merge topic 'xl-cc-default-std'
194b74daec XL: Fix C default level detection when invoked as 'cc'

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1854
2018-03-15 07:52:59 -04:00
Brad King aaf56620d1 Merge topic 'bootstrap-clarify-error'
25eb6e60d7 bootstrap: Clarify error when building with invalid CXXFLAGS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !1850
2018-03-15 07:52:19 -04:00
Brad King c388487bd5 Merge topic 'findjni-mips-r6-new-arch'
8c92596e96 FindJNI: add some new architecture names for mips release 6

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1853
2018-03-15 07:51:29 -04:00
Brad King aa41fa90fd Merge branch 'gtest_discover_tests_timeout' into release-3.10
Merge-request: !1851
2018-03-15 07:45:05 -04:00
Craig Scott 96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash
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
2018-03-15 07:36:42 -04:00
Brad King c89993d529 Tests: Avoid enabling languages unnecessarily in RunCMake.project 2018-03-15 21:52:21 +11:00
Kitware Robot 07f9f41f50 CMake Nightly Date Stamp 2018-03-15 00:01:07 -04:00
Brad King 298e1bfe28 Merge branch 'xl-cc-default-std' into release-3.11
Merge-request: !1854
2018-03-14 14:08:23 -04:00
Brad King 194b74daec XL: Fix C default level detection when invoked as 'cc'
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
2018-03-14 14:07:00 -04:00
Hannes Mezger 5a7113d8fb VS: Add target property VS_DEBUGGER_COMMAND
Fixes: #17819
2018-03-14 13:27:15 -04:00
Tobias R. Henle 334c8ba7a4 CodeLite: Prefer CMAKE_RUNTIME_OUTPUT_DIRECTORY for output path
Use the deprecated `EXECUTABLE_OUTPUT_PATH` as a fallback.
2018-03-14 13:23:28 -04:00
Tobias R. Henle acd322ebe4 CodeLite: Use project Makefile instead of workspace Makefile.
Use the selected project Makefile instead of the global workspace
Makefile during build of a project.
2018-03-14 13:20:28 -04:00
Ben Chaney 25eb6e60d7 bootstrap: Clarify error when building with invalid CXXFLAGS
Mention the flags used when complaining that the compiler does not work.
2018-03-14 11:28:10 -04:00
Brad King 7bbaead87d Merge branch 'findjni-mips-r6-new-arch' into release-3.11
Merge-request: !1853
2018-03-14 11:18:14 -04:00
YunQiang Su 8c92596e96 FindJNI: add some new architecture names for mips release 6 2018-03-14 11:17:19 -04:00
Brad King ce0b983216 target_compile_options: Add syntax to specify shell strings
Options specified via `COMPILE_OPTIONS` and `INTERFACE_COMPILE_OPTIONS`
are deduplicated, but individual options can legitimately be duplicated
when grouped with other options, e.g.

    -D A -D B

After deduplication that becomes `-D A B`.  Therefore we need a way to
treat groups of options as units during deduplication.  A simple approach
is to specify each group as one option, e.g.

    "-D A" "-D B"

However, that conflicts with options that legitimately have spaces.  To
break this ambiguity, add a `SHELL:` prefix syntax to specify that an
option should be parsed like shell command line arguments after
deduplication, e.g.

    "SHELL:-D A" "SHELL:-D B"

These will survive deduplication intact, and then be parsed to produce
`-D A -D B` on the final command line.

Fixes: #15826
2018-03-14 11:10:25 -04:00
Brad King ccdd79d38e Merge topic 'cmake_project_xxx_docs'
6a2a9d107d Help: Fix incorrect CMAKE_PROJECT_xxx docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1847
2018-03-14 10:51:11 -04:00
Brad King 443a52aa85 Merge topic 'build_and_test_mode_docs'
8b43adc45c Help: Clarify ctest build-and-test mode options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1848
2018-03-14 10:50:29 -04:00
Brad King 4fb91a8868 Merge topic 'doc-vs-workdir-versions'
4b25cc452a Help: Document VS_DEBUGGER_WORKING_DIRECTORY supported VS versions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1843
2018-03-14 10:49:11 -04:00
Kitware Robot 65b7648609 CMake Nightly Date Stamp 2018-03-14 00:01:10 -04:00
Craig Scott 6a2a9d107d Help: Fix incorrect CMAKE_PROJECT_xxx docs
The docs for CMAKE_PROJECT_NAME and CMAKE_PROJECT_DESCRIPTION
were erroneously documenting the behavior of PROJECT_NAME and
PROJECT_DESCRIPTION respectively. Fix these and update the
project() docs to also mention CMAKE_PROJECT_NAME and
CMAKE_PROJECT_DESCRIPTION.

Fixes: #17815
2018-03-14 07:33:38 +11:00
Craig Scott 8b43adc45c Help: Clarify ctest build-and-test mode options
Fixes: #17807
2018-03-14 07:27:54 +11:00
Brad King 3d5717ebfd Merge branch 'release-3.11' 2018-03-13 13:43:52 -04:00
Brad King fc573c2300 Merge branch 'release-3.10' 2018-03-13 13:43:03 -04:00
Brad King bdbee54a83 Merge topic 'genex-COMPILE_LANGUAGE-system-include'
1b5e52fd65 Genex: Fix COMPILE_LANGUAGE propagation through try_compile
2deb9b7f34 Genex: Fix COMPILE_LANGUAGE in SYSTEM include directories

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1844
2018-03-13 13:42:45 -04:00
Brad King 7c557e2227 Merge topic 'ccmake-stack-smashing'
7899e53691 ccmake: fix status line buffer overflow on very wide terminals

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1836
2018-03-13 13:42:00 -04:00
Brad King a039029e7c Merge branch 'genex-COMPILE_LANGUAGE-system-include' into release-3.11
Merge-request: !1844
2018-03-13 13:40:25 -04:00
Brad King a54b56a10b Merge branch 'ccmake-stack-smashing' into release-3.11
Merge-request: !1836
2018-03-13 13:40:17 -04:00
Brad King 354a33fdf3 Merge branch 'ccmake-stack-smashing' into release-3.10
Merge-request: !1836
2018-03-13 13:39:32 -04:00
Tianhao Chai 7899e53691 ccmake: fix status line buffer overflow on very wide terminals
A mistyped length calculation will memset across stack frame when
the user's terminal width is larger than 270.
2018-03-13 13:38:12 -04:00
Hannes Mezger 4b25cc452a Help: Document VS_DEBUGGER_WORKING_DIRECTORY supported VS versions 2018-03-13 10:13:59 +01:00
Kitware Robot b2584ce069 CMake Nightly Date Stamp 2018-03-13 00:01:15 -04:00
Brad King 89d00bfcee Merge branch 'release-3.11' 2018-03-12 13:51:30 -04:00
Brad King bab82b0935 Merge branch 'ep-support-passing-var-ending-with-notfound' into release-3.11
Merge-request: !1838
2018-03-12 13:50:45 -04:00
Brad King 2dad620452 Merge topic 'update-buildsystem-docs'
78756429ab Help: Adapt cmake-buildsystem(7) to new IMPORTED targets features

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1839
2018-03-12 13:50:37 -04:00
Brad King 83071fff75 Merge topic 'ep-support-passing-var-ending-with-notfound'
7ad981c8f7 ExternalProject: Fix cache generation when last args ends with "-NOTFOUND"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1838
2018-03-12 13:49:44 -04:00
Jean-Christophe Fillion-Robin 7ad981c8f7 ExternalProject: Fix cache generation when last args ends with "-NOTFOUND" 2018-03-12 13:45:50 -04:00
Brad King 378a11cdba Merge topic 'genex-TARGET_EXISTS'
7fec336bf7 genex: Add TARGET_EXISTS to check for target existence

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1829
2018-03-12 13:42:18 -04:00
Brad King 746ebaf563 Merge topic 'xml-raii'
90086767dd cmGlobalVisualStudio10Generator: Use cmXMLWriter RAII helpers
8401b6ac4e cmXMLWriter: Add RAII helpers to allow DOM-like syntax

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1818
2018-03-12 13:41:28 -04:00
Brad King fac050ec8d Merge topic 'update-dllplatform'
2dc2a3eb15 Identify DLL platforms via CMAKE_IMPORT_LIBRARY_SUFFIX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1832
2018-03-12 13:40:44 -04:00
Brad King 725b0cab86 Merge topic 'cmake-rc-version-decimal'
588a1afe76 CMakeVersion.rc: Avoid leading zeros in integer version components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1835
2018-03-12 13:39:45 -04:00
Brad King 1b5e52fd65 Genex: Fix COMPILE_LANGUAGE propagation through try_compile
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
2018-03-12 13:30:14 -04:00
Brad King 2deb9b7f34 Genex: Fix COMPILE_LANGUAGE in SYSTEM include directories
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
2018-03-12 11:45:01 -04:00
Brad King c6e8442e4c Merge branch 'update-buildsystem-docs' into release-3.11
Merge-request: !1839
2018-03-12 10:25:53 -04:00
Kai Wolf 78756429ab Help: Adapt cmake-buildsystem(7) to new IMPORTED targets features
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.
2018-03-12 10:23:21 -04:00
Kitware Robot b340cacde8 CMake Nightly Date Stamp 2018-03-12 00:01:06 -04:00
Kitware Robot c703972694 CMake Nightly Date Stamp 2018-03-11 00:01:06 -05:00
Kitware Robot 6dbdfab1a9 CMake Nightly Date Stamp 2018-03-10 00:01:12 -05:00
Brad King 588a1afe76 CMakeVersion.rc: Avoid leading zeros in integer version components
The split in commit v3.11.0-rc1~232^2 (CMakeVersion RC file: Split patch
into 2 components, 2017-12-01) can leave components "2018,0309", but the
latter is an octal constant with digit "9" out of range.  Strip the
leading zero to express the components as "2018,309" so the resource
compiler treats them as decimal.
2018-03-09 10:52:49 -05:00