mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-21 21:58:50 -05:00
Code Issues Packages Projects Releases Wiki Activity
40,795 Commits 2 Branches 401 Tags
9df49ba020ebfa15571ce818631bed6043368c8e
Commit Graph

40795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King 9df49ba020 Merge topic 'update-prebuilt-openssl' 
ab6bf9d0ad Utilities/Release: Update to openssl-1.1.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2461
 2018-10-09 06:24:34 -04:00
Kitware Robot 0ab5db035e CMake Nightly Date Stamp 2018-10-09 00:01:08 -04:00
Brad King 2b836a0121 Merge branch 'release-3.13' 2018-10-08 11:27:39 -04:00
Brad King 4422ee3cb2 Merge topic 'add_ctest_progress_docs' 
2154ea38f9 Help: Add missing docs for the ctest --progress option
fb2cdf4d4c Help: Use :envvar: links for env vars affecting ctest command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Michael Wegner <michael.t.wegner@gmail.com>
Merge-request: !2454
 2018-10-08 11:26:52 -04:00
Brad King c3e27c2562 Merge topic 'project-always-set-desc-url' 
f8a086a86b project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are set
b27247c8df project(): Add tests verifying variables set by second project() call

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2457
 2018-10-08 11:26:21 -04:00
Brad King c76e024a3d Merge topic 'list-SORT-docs' 
cdf8d79e9f Help: Improve/fix incorrect docs for list(SORT) sub-options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2453
 2018-10-08 11:25:38 -04:00
Brad King c2356d60d8 Merge branch 'project-always-set-desc-url' into release-3.13 
Merge-request: !2457
 2018-10-08 11:21:48 -04:00
Brad King 981cdceca2 Merge branch 'add_ctest_progress_docs' into release-3.13 
Merge-request: !2454
 2018-10-08 11:21:36 -04:00
Brad King bad9bc78e3 Merge branch 'list-SORT-docs' into release-3.13 
Merge-request: !2453
 2018-10-08 11:21:23 -04:00
Brad King f87b0be825 Merge branch 'release-3.13' 2018-10-08 11:11:41 -04:00
Brad King 27189b9658 Merge branch 'release-3.12' 2018-10-08 11:11:22 -04:00
Brad King fcb47f4331 Merge topic 'UseSWIG-php-regression' 
ecd0fec40b UseSWIG: fix regression for PHP language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2448
 2018-10-08 11:10:59 -04:00
Brad King 20e14baae7 Merge topic 'autogen-moc-predef-cross-compile' 
66f49d1f9a Android: Add clang --target= flag to compiler predefines command
39534c58c5 Autogen: Add clang --target= flag to compiler predefines command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: André Klitzing <aklitzing@gmail.com>
Merge-request: !2452
 2018-10-08 11:10:19 -04:00
Brad King c780f5eea7 Merge branch 'UseSWIG-php-regression' into release-3.13 
Merge-request: !2448
 2018-10-08 11:09:18 -04:00
Brad King d92737821f Merge branch 'autogen-moc-predef-cross-compile' into release-3.13 
Merge-request: !2452
 2018-10-08 11:09:08 -04:00
Brad King ab6bf9d0ad Utilities/Release: Update to openssl-1.1.1 
Update the prebuilt binary build configurations for machines where
we build our own OpenSSL library to use a newer version.
 2018-10-08 10:42:12 -04:00
Kitware Robot e3666e8ffe CMake Nightly Date Stamp 2018-10-08 00:01:06 -04:00
Craig Scott f8a086a86b project(): Ensure DESCRIPTION and HOMEPAGE_URL variables are set 
If a project() call does not have DESCRIPTION or HOMEPAGE_URL
options, it must still set the relevant variables or else those variables will
inherit values from an earlier project() call. That is inconsistent with how
VERSION is handled and is likely to be unexpected. The docs were also
ambiguous about what should happen in such cases.
 2018-10-08 08:28:17 +11:00
Craig Scott b27247c8df project(): Add tests verifying variables set by second project() call 2018-10-08 08:28:01 +11:00
Craig Scott 2154ea38f9 Help: Add missing docs for the ctest --progress option 
These docs were missing from the changes that introduced the feature in
!2240.
 2018-10-07 17:03:36 +11:00
Craig Scott fb2cdf4d4c Help: Use :envvar: links for env vars affecting ctest command 2018-10-07 17:03:36 +11:00
Kitware Robot f0c8d162f5 CMake Nightly Date Stamp 2018-10-07 00:01:05 -04:00
Craig Scott cdf8d79e9f Help: Improve/fix incorrect docs for list(SORT) sub-options 2018-10-06 18:10:38 +10:00
Kitware Robot 342551be71 CMake Nightly Date Stamp 2018-10-06 00:01:10 -04:00
Brad King 05d3411c19 Merge branch 'UseSWIG-php-regression' into release-3.12 
Merge-request: !2448
 2018-10-05 13:14:31 -04:00
Marc Chevrier ecd0fec40b UseSWIG: fix regression for PHP language 
Refactoring in commit v3.12.0-rc1~481^2 (UseSWIG: modernize module,
2018-01-29) accidentally regressed support for PHP.  Fix it.

Fixes: #18421
 2018-10-05 13:11:17 -04:00
Brad King 66f49d1f9a Android: Add clang --target= flag to compiler predefines command 
When we set `CMAKE_<LANG>_COMPILER_TARGET` to the Android target
architecture, add it to `CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND` also.
This is needed to make moc predefines aware of `__ANDROID__`.

Fixes: #18425
 2018-10-05 10:23:52 -04:00
Brad King 39534c58c5 Autogen: Add clang --target= flag to compiler predefines command 
Respect the compiler target value `CMAKE_<LANG>_COMPILER_TARGET` in
`CMAKE_<LANG>_COMPILER_PREDEFINES_COMMAND`.

Issue: #18425
 2018-10-05 10:23:52 -04:00
Brad King 02a1dbbb6c Merge branch 'release-3.13' 2018-10-05 08:03:11 -04:00
Brad King 50f427e022 Merge topic 'doc-find_package-update' 
c90f3dff82 Help: Clarify find_package Module and Config mode relation
26dac50220 Help: Remove redundant recommendation
11058a2e7c Help: Add internal section link to find_package command docs
aaf5ea2d70 Help: Add section headers to find_package command
56310b0671 Help: Move find_package NO_POLICY_SCOPE to more appropriate location
336dce1c95 Help: Add table of contents to find_package command docs
463d59d331 Help: Rephrase summary in find_package command docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2446
 2018-10-05 07:55:57 -04:00
Brad King 3261e18f03 Merge branch 'doc-find_package-update' into release-3.13 
Merge-request: !2446
 2018-10-05 07:54:27 -04:00
Kitware Robot 25a9704058 CMake Nightly Date Stamp 2018-10-05 00:01:06 -04:00
Joachim Wuttke (l) c90f3dff82 Help: Clarify find_package Module and Config mode relation 2018-10-04 16:43:40 -04:00
Brad King 26dac50220 Help: Remove redundant recommendation 
We suggest that users prefer the basic signature in two places.
Drop the latter and move its related content to a better section.
 2018-10-04 16:43:02 -04:00
Joachim Wuttke (l) 11058a2e7c Help: Add internal section link to find_package command docs 2018-10-04 16:42:42 -04:00
Joachim Wuttke (l) aaf5ea2d70 Help: Add section headers to find_package command 
The document is pretty long but is already mostly organized into
sections.  Add explicit section headers.
 2018-10-04 14:57:56 -04:00
Joachim Wuttke (l) 56310b0671 Help: Move find_package NO_POLICY_SCOPE to more appropriate location 2018-10-04 14:57:56 -04:00
Joachim Wuttke (l) 336dce1c95 Help: Add table of contents to find_package command docs 2018-10-04 14:57:55 -04:00
Joachim Wuttke (l) 463d59d331 Help: Rephrase summary in find_package command docs 2018-10-04 14:57:49 -04:00
Brad King cef4dcfe9d Merge branch 'release-3.13' 2018-10-04 14:39:40 -04:00
Brad King 10fca3ccc2 Merge topic 'doc-osx-vars-as-cache' 
bc57c32d7a Help: Document CMAKE_OSX_* variables as cache entries

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2443
 2018-10-04 14:39:16 -04:00
Brad King c4ff696971 Merge branch 'doc-osx-vars-as-cache' into release-3.13 
Merge-request: !2443
 2018-10-04 14:37:51 -04:00
James Turner bc57c32d7a Help: Document CMAKE_OSX_* variables as cache entries 
The variables

* CMAKE_OSX_ARCHITECTURES
* CMAKE_OSX_DEPLOYMENT_TARGET
* CMAKE_OSX_SYSROOT

should be set as cache entries.  Document this explicitly.
 2018-10-04 11:23:07 -04:00
Brad King 0abf88f6f6 Merge branch 'release-3.13' 2018-10-04 10:37:16 -04:00
Brad King cf57c27150 Merge topic 'pkgc-op-lt-gt' 
aa51bfd74f FindPkgConfig: support also > and < operators for version compares

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2435
 2018-10-04 10:36:49 -04:00
Brad King a9ff6cefe5 Merge branch 'pkgc-op-lt-gt' into release-3.13 
Merge-request: !2435
 2018-10-04 10:35:39 -04:00
Rolf Eike Beer aa51bfd74f FindPkgConfig: support also > and < operators for version compares 
Fixes: #18416
 2018-10-04 10:32:13 -04:00
Brad King bfc6a94591 Merge branch 'release-3.13' 2018-10-04 10:13:50 -04:00
Brad King a9b442cdc7 Merge branch 'misc-typos' into release-3.13 
Merge-request: !2440
 2018-10-04 10:13:12 -04:00
Brad King 9de94f10ae Merge branch 'doc-cmp0077' into release-3.13 
Merge-request: !2439
 2018-10-04 10:13:03 -04:00