Commit Graph

39549 Commits

Author SHA1 Message Date
Michael Stürmer b7c2b2cd78 cmVisualStudio10TargetGenerator: add handling of static C# targets 2018-05-07 07:21:12 +02:00
Michael Stürmer d244f2cad3 cmVisualStudio10TargetGenerator: add handling of manual /clr setting 2018-05-07 07:21:10 +02:00
Michael Stürmer 1e5a8f882f cmVisualStudio10TargetGenerator: fix checking for managed target 2018-05-07 07:21:08 +02:00
Michael Stürmer 8d7ffed048 cmVisualStudio10TargetGenerator: issue warning when adding static C# lib 2018-05-07 07:20:46 +02:00
Michael Stürmer 73ee599a82 cmGeneratorTarget: make GetManagedType() return 'Native' for static targets 2018-05-07 07:20:45 +02:00
Kitware Robot 7489d9cb24 CMake Nightly Date Stamp 2018-05-07 00:01:08 -04:00
Craig Scott dfc6923428 Merge topic 'cpack_module_indentation_fix'
a01c6e9921 CPack: Fix indentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2041
2018-05-06 07:14:54 -04:00
Kitware Robot c97189f9d1 CMake Nightly Date Stamp 2018-05-06 00:01:05 -04:00
Kitware Robot 135825df20 CMake Nightly Date Stamp 2018-05-05 00:01:06 -04:00
Craig Scott a01c6e9921 CPack: Fix indentation
Addresses indentation not matching guidelines, missed in !2020.
No functional changes and no changes to docs.
2018-05-05 09:48:25 +10:00
Brad King e628d6cd06 Merge topic 'vs-refactor-xml'
3f315dc128 cmVisualStudio10TargetGenerator: XML refactoring

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2028
2018-05-04 11:26:36 -04:00
Brad King 5e5ef61ed3 Merge topic 'doc-xref-envvar'
828e18bb3e cmRST: Add support for 'envvar' cmake domain role

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2038
2018-05-04 11:04:53 -04:00
Vitaly Stakhovsky 3f315dc128 cmVisualStudio10TargetGenerator: XML refactoring 2018-05-04 10:46:11 -04:00
Brad King fc35e817ee Merge topic 'test-CheckSourceTree-in-source'
46fa1af514 Tests: Fix CheckSourceTree for in-source non-dashboard builds

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2025
2018-05-04 09:37:14 -04:00
Brad King efaaa729aa Merge topic 'genex-complang-not-loaded'
4f82199bef Genex: Allow COMPILE_LANGUAGE to name a language that is not loaded

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2031
2018-05-04 09:36:08 -04:00
Brad King 828e18bb3e cmRST: Add support for 'envvar' cmake domain role
This was accidentally left out of commit 8acf46caf1 (Utilities/Sphinx:
Add role and directive for 'envvar' in CMake domain, 2018-04-19).
2018-05-04 07:52:14 -04:00
Kitware Robot c89d2f4a6a CMake Nightly Date Stamp 2018-05-04 00:01:05 -04:00
Craig Scott 7de29da7c4 Merge topic 'feature/cpack-default-package-version'
af1c48871c CPack: Use project version as default for `CPACK_PACKAGE_VERSION`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Harry Mallon <hjmallon@gmail.com>
Merge-request: !2020
2018-05-03 17:18:38 -04:00
Israel Blancas 46fa1af514 Tests: Fix CheckSourceTree for in-source non-dashboard builds
For in-source builds we must tolerate non-tracked files in the
source tree.  Previously we only tolerated them for dashboard
builds during automated testing, but we should tolerate them for
local user builds too.

Fixes: #17868
2018-05-03 09:35:45 -04:00
Henry Schreiner 4f82199bef Genex: Allow COMPILE_LANGUAGE to name a language that is not loaded
Evaluate to false on `$<COMPILE_LANGUAGE:Lang>` if language `Lang`
is not loaded.  This is helpful in exported targets consumed in other
projects that may not enable all the same languages.

Fixes: #17952
2018-05-03 08:34:39 -04:00
Brad King f1aedbf99a Merge branch 'release-3.11' 2018-05-03 08:15:19 -04:00
Brad King 593c409a65 Merge topic 'ctest-libuv-linux-sparc64'
1c22fdf360 libuv: linux/sparc64: use fcntl to set and clear O_NONBLOCK

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2029
2018-05-03 08:13:16 -04:00
Brad King 7c2866ec60 Merge topic 'namelink-component'
7e8046e20b Help: add release notes for NAMELINK_COMPONENT
c02eeb0853 Help: clarify "undefined behavior" in install(EXPORT) command
edcb545a24 install: add test for new NAMELINK_COMPONENT parameter
0212d7c762 install: add NAMELINK_COMPONENT argument
cbb609072f Help: clean up install(TARGETS) documentation
b81280ba1f Help: add list of command signatures to top of INSTALL page

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Alex Turbov <i.zaufi@gmail.com>
Merge-request: !1982
2018-05-03 08:11:20 -04:00
Kyle Edwards 7e8046e20b Help: add release notes for NAMELINK_COMPONENT 2018-05-03 08:08:42 -04:00
Kyle Edwards c02eeb0853 Help: clarify "undefined behavior" in install(EXPORT) command
The "undefined behavior" that the install(EXPORT) command warned about
was simply the possibility of build errors (or other errors) if the
referenced targets aren't installed. As long as the referenced targets
are installed, this won't be an issue.
2018-05-03 08:08:42 -04:00
Kyle Edwards edcb545a24 install: add test for new NAMELINK_COMPONENT parameter 2018-05-03 08:08:42 -04:00
Kyle Edwards 0212d7c762 install: add NAMELINK_COMPONENT argument
For shared libraries, this allows you to specify separate components
for the shared library and for the namelink.

Suggested in https://cmake.org/pipermail/cmake-developers/2014-December/024032.html.
2018-05-03 08:08:37 -04:00
Brad King 1e788a964d Merge topic 'doc-build-event-order'
6dd11ffbde Help: Clarify add_custom_command build event execution order

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2030
2018-05-03 07:55:34 -04:00
Brad King 2d7a0862e4 Merge topic 'doc-server-pipe'
7a50425caa Help: Fix and clarify server mode --pipe= option docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2026
2018-05-03 07:54:21 -04:00
Kitware Robot 9575952996 CMake Nightly Date Stamp 2018-05-03 00:01:05 -04:00
Alex Turbov af1c48871c CPack: Use project version as default for CPACK_PACKAGE_VERSION
* Introduce `CMAKE_PROJECT_VERSION` and the corresponsing components:
  `CMAKE_PROJECT_VERSION_MAJOR`, `CMAKE_PROJECT_VERSION_MINOR`,
  `CMAKE_PROJECT_VERSION_PATCH` and `CMAKE_PROJECT_VERSION_TWEAK`.

* `CPack` module use `CMAKE_PROJECT_VERSION_MAJOR`,
  `CMAKE_PROJECT_VERSION_MINOR` and `CMAKE_PROJECT_VERSION_PATCH`
  to initialize corresponsing CPack variables.
2018-05-03 08:26:03 +10:00
Brad King 6dd11ffbde Help: Clarify add_custom_command build event execution order
Fixes: #17949
2018-05-02 13:19:00 -04:00
Israel Blancas 7a50425caa Help: Fix and clarify server mode --pipe= option docs
Document the `=` in the option name.  Clarify the term "named pipe" as
an abstraction of local domain sockets on Unix and named pipes on
Windows.
2018-05-02 13:10:17 -04:00
Brad King 5e455ac120 Merge topic 'code-improvements'
0c47ed6430 cmMakefile: Convert private helpers to file static functions
e13fa223fc cmMakefile: Improve ExpandVariablesInString return type
b542e0c74f cmCPluginAPI: Remove a few unnecessary c_str() calls

Acked-by: Kitware Robot <kwrobot@kitware.com>
Rejected-by: Marc Chevrier <marc.chevrier@gmail.com>
Merge-request: !2018
2018-05-02 11:33:33 -04:00
Brad King 5089d950c3 Merge branch 'ctest-libuv-linux-sparc64' into release-3.11
Merge-request: !2029
2018-05-02 11:21:04 -04:00
Brad King 1c22fdf360 libuv: linux/sparc64: use fcntl to set and clear O_NONBLOCK
Upstream libuv commits:

* node-v0.6.0~28 (linux: use ioctl(FIONBIO) to set O_NONBLOCK, saves a syscall, 2011-10-29)
* v1.11.0~11 (unix: use async-signal safe functions between fork and exec, 2016-12-12)

left an asymmetry in the way O_NONBLOCK is set and cleared.  Normally
ioctl/FIONBIO is used for both.  However, uv_spawn uses fcntl/O_NONBLOCK
to clear O_NONBLOCK between fork and exec.  This fails on Linux/sparc64
where setting via ioctl/FIONBIO actually sets two bits (in O_NDELAY)
that cause clearing via fcntl/O_NONBLOCK to be silently ignored (though
clearing via ioctl/FIONBIO or fcntl/O_NDELAY works).

Since CMake commit v3.11.0-rc1~117^2 (CTest: Re-implement test process
handling using libuv, 2017-12-10), CTest uses libuv.  On Linux/sparc64
child processes have been started with non-blocking output pipes.  This
can lead to write errors or lost output from children not prepared to
deal with `EAGAIN` on stdout or stderr.

Fix this for now by switching libuv back to fcntl/O_NONBLOCK to set and
clear O_NONBLOCK when compiled on Linux/sparc64.

LibUV-Issue: 1830
Fixes: #17941
2018-05-02 11:16:19 -04:00
Kitware Robot e90fa38f8d CMake Nightly Date Stamp 2018-05-02 00:01:04 -04:00
Brad King 4ac48237a0 Merge topic 'source_group-empty-prefix'
b3baa97e80 Source_Group: Allow an empty prefix with the TREE syntax.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2022
2018-05-01 11:32:59 -04:00
Brad King 1155f96dd9 Merge topic 'doc-wiki-links'
052743556b Modules: Update documented links to CMake community Wiki

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2023
2018-05-01 11:32:29 -04:00
Vitaly Stakhovsky 0c47ed6430 cmMakefile: Convert private helpers to file static functions
The two-argument forms of `AddDefineFlag` and `RemoveDefineFlag`
need no access to `cmMakefile` class members.  They are used only
within the implementation file.
2018-05-01 10:25:49 -04:00
Vitaly Stakhovsky e13fa223fc cmMakefile: Improve ExpandVariablesInString return type
Return `std::string const&` instead of a `const char*` that points
into a string anyway.  Update call sites accordingly.
2018-05-01 10:24:31 -04:00
Vitaly Stakhovsky b542e0c74f cmCPluginAPI: Remove a few unnecessary c_str() calls 2018-05-01 10:21:53 -04:00
Kitware Robot 6f0cd64f89 CMake Nightly Date Stamp 2018-05-01 00:01:03 -04:00
Brad King 052743556b Modules: Update documented links to CMake community Wiki
The wiki has moved.  Update links to reference the new pages.
2018-04-30 15:34:50 -04:00
Yohann Benedic b3baa97e80 Source_Group: Allow an empty prefix with the TREE syntax.
When calling

    source_group(TREE <root> PREFIX "" FILES ...)

the files located at the root directory were not assigned
to the correct source group: they were put in a default
group (e.g. "Source Files" in Visual Studio).

Fixes: #17608
2018-04-30 16:44:08 +02:00
Brad King f6c558e315 Merge topic 'cpack_docs_cleanup'
9a8687121f Help: Improve accuracy, readability and cross-referencing of cpack docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2013
2018-04-30 09:25:08 -04:00
Brad King 9b19d922c8 Merge branch 'release-3.11' 2018-04-30 09:22:22 -04:00
Brad King ddff7aebbc Merge topic 'cxx-checks-tolerate-more-warnings'
2254b72061 C++ feature checks: Filter out warnings caused by local configuration

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2019
2018-04-30 09:21:16 -04:00
Brad King 27279fa2db Merge topic 'java-new-packaging-version-sort'
1013560a6a FindJava, FindJNI: Ensure most recent version is searched first

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2016
2018-04-30 09:20:42 -04:00
Brad King 321442580e Merge branch 'cxx-checks-tolerate-more-warnings' into release-3.11
Merge-request: !2019
2018-04-30 09:18:58 -04:00