mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-05-01 03:29:18 -05:00
Code Issues Packages Projects Releases Wiki Activity
39,037 Commits 2 Branches 401 Tags
80784ef77fa95138b197416905b3d4acf0a0d78a
Commit Graph

39037 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Scott 80784ef77f Merge topic 'project-homepage-url' 
73f9b2974c project: Add HOMEPAGE_URL named parameter
fd28c382b4 project: Add <PROJECT-NAME>_DESCRIPTION
9b57cb62ea Help: Fix minor typo in docs for CMAKE_PROJECT_DESCRIPTION
c89993d529 Tests: Avoid enabling languages unnecessarily in RunCMake.project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1816
 2018-03-17 18:24:44 -04:00
Kitware Robot c824b6c667 CMake Nightly Date Stamp 2018-03-17 00:01:12 -04:00
Alex Turbov 73f9b2974c project: Add HOMEPAGE_URL named parameter 
This sets variables like PROJECT_HOMEPAGE_URL, which can be
used as default values for various things (packaging modules,
doxygen defaults, etc.). Some packaging modules have been
updated to do this as part of this commit.

Co-Author: Craig Scott <craig.scott@crascit.com>
 2018-03-17 08:25:48 +11:00
Craig Scott fd28c382b4 project: Add <PROJECT-NAME>_DESCRIPTION 
For consistency with the VERSION keyword, also define the
<PROJECT-NAME>_DESCRIPTION variable.
 2018-03-17 08:25:48 +11:00
Craig Scott 9b57cb62ea Help: Fix minor typo in docs for CMAKE_PROJECT_DESCRIPTION 2018-03-17 08:25:48 +11:00
Brad King b3e668ea25 Merge branch 'release-3.10' 2018-03-16 08:39:53 -04:00
Brad King f919600ed6 Merge branch 'release-3.11' 2018-03-16 07:52:47 -04:00
Brad King df27bd3f83 Merge branch 'gtest_discover_tests_timeout' into release-3.11 
Merge-request: !1851
 2018-03-16 07:52:23 -04:00
Brad King e4a0d8f399 CMake 3.10.3 v3.10.3 2018-03-16 07:34:34 -04:00
Brad King 5eb20f66ec Merge branch 'release-3.10' 2018-03-16 07:29:11 -04:00
Brad King 30b7c40ad8 Merge topic 'gtest_discover_tests_timeout' 
96fdde26bb GoogleTest: Rename TIMEOUT parameter to avoid clash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1851
 2018-03-16 07:27:16 -04:00
Kitware Robot 43e8e0b688 CMake Nightly Date Stamp 2018-03-16 00:01:12 -04:00
Brad King 018946aaaf Merge topic 'clarify-contributing-doc' 
27502491dd CONTRIBUTING: Clarify choice of master or release branch as a base

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
Merge-request: !1845
 2018-03-15 07:58:33 -04:00
Jean-Christophe Fillion-Robin 27502491dd CONTRIBUTING: Clarify choice of master or release branch as a base 2018-03-15 07:56:30 -04:00
Brad King 2ab900c71b Merge topic 'compile-options-shell' 
ce0b983216 target_compile_options: Add syntax to specify shell strings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1841
 2018-03-15 07:55:14 -04:00
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
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