Commit Graph

36405 Commits

Author SHA1 Message Date
Ivan Shcherbakov 0c57238215 server: Report backtraces in codemodel response
Report the source locations (e.g. in `CMakeLists.txt`) for all targets
and target-related statements.  This allows IDEs to locate the
statements and automatically edit them when the user adds or removes
files or changes target properties via GUI.

Increment the protocol minor version number to tell clients that the new
information is available.
2017-07-11 07:50:22 -04:00
Ivan Shcherbakov 4db3227514 server: Rename cmServerProtocol1_0 to cmServerProtocol1
It will serve additional minor versions.

Suggested-by: Tobias Hunger <tobias.hunger@qt.io>
2017-07-06 11:03:14 -04:00
Brad King 8308803167 Merge topic 'FindICU-data-vars'
3566af83 FindICU: Search for packaged data files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !981
2017-06-20 09:00:32 -04:00
Brad King c2f119310f Merge topic 'FindwxWidgets-fix-flag-parse'
a7a0bf86 FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -I

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !975
2017-06-20 08:59:40 -04:00
Brad King 7d83b8010e Merge topic 'curses-form-advanced'
8b53dee2 FindCurses: mark CURSES_FORM_LIBRARY as advanced

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !978
2017-06-20 08:58:39 -04:00
Brad King 95f546ec2b Merge topic 'vs_dotnet_referenceprop_documentation'
18443600 Vs: fix documentation for target property VS_DOTNET_REFERENCEPROP_*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !980
2017-06-20 08:57:12 -04:00
Kitware Robot 829ce06c35 CMake Nightly Date Stamp 2017-06-20 00:01:06 -04:00
Thierry Crozat a7a0bf861a FindwxWidgets: Fix parsing of cxxflags when paths contain -D or -I
Use proper command-line parsing rather than accidentally matching
content in the middle of paths that looks like flags.

Fixes: #16986
2017-06-19 13:56:09 -04:00
Brad King 622b4dd785 Merge topic 'vs_csharp_fix_win32manifest_param'
ec7b3af7 Vs: remove /nowin32manifest from C# flags to enable default VS behavior

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !969
2017-06-19 11:27:30 -04:00
Brad King 7c369ebf03 Merge topic 'FindHDF5-parallel-from-wrapper'
8b9d8c4d FindHDF5: Fix parallel detection when primary compiler is an HDF5 wrapper

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !974
2017-06-19 11:27:10 -04:00
Kitware Robot 3558fe0657 CMake Nightly Date Stamp 2017-06-19 00:01:04 -04:00
Kitware Robot e10c9ef1eb CMake Nightly Date Stamp 2017-06-18 00:01:04 -04:00
Roger Leigh 3566af83f9 FindICU: Search for packaged data files
The files Makefile.inc and pkgdata.inc are installed by ICU to
<libdir>/icu and on some distributions to <libdir>/<arch>/icu.
These are required by ICU tools like pkgdata, and so are needed
by other package build systems at build time, in addition to the
libraries and executables already searched for.

Search for the files and create cache entries for them, as done
for executables.
2017-06-17 23:07:44 +01:00
Michael Stürmer 1844360099 Vs: fix documentation for target property VS_DOTNET_REFERENCEPROP_* 2017-06-17 22:56:28 +02:00
Daniel Pfeifer 8b53dee296 FindCurses: mark CURSES_FORM_LIBRARY as advanced 2017-06-17 15:13:50 +02:00
Kitware Robot 1363a0cbce CMake Nightly Date Stamp 2017-06-17 00:01:08 -04:00
Chuck Atkins 8b9d8c4ddc FindHDF5: Fix parallel detection when primary compiler is an HDF5 wrapper
This is covering a different use case where your primary compilers are
HDF5 wrappers, as is the case when using the Cray Programming
Environment. The existing code tries to query the compiler using options
only available to h5cc and friends, which doesn't work when your wrapper
is not h5cc, as is the case with the CrayPE. This change instead pulls
strings out of a test binary when testing for "is your regular compiler
an HDF5 wrapper" while the "query wrapper for options" is reserved for
the "I found the hdf5 wrappers but they're not your main compiler" mode.
2017-06-16 11:40:02 -04:00
Brad King 67fe57478b Merge branch 'release-3.9' 2017-06-16 09:51:55 -04:00
Brad King 4dbbb275d5 Merge topic 'doc-dev-maint'
b0725f2f Help/dev: Add review instructions to maintainer guide

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !973
2017-06-16 09:51:02 -04:00
Brad King c670d1b50b Merge topic 'fix-shadow-field-warnings'
54c51e79 cmCPackDragNDropGenerator: Drop unused member
7b02cb29 cmCommonTargetGenerator: Rename member to avoid shadowing
c1f15e1c cmGlobalGenerator: Rename member to avoid shadowing

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !968
2017-06-16 09:37:58 -04:00
Brad King 97010a5b65 Merge topic 'doc-check-compiler-flag'
aa944c88 Check*CompilerFlag: Rewrite documentation of these modules

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !972
2017-06-16 09:37:30 -04:00
Brad King 6c60ec0907 Merge topic 'doc-compile-features'
c4610df0 Help: Document that VS 2017 compile features are recorded
69d50a7e Help: Fix typo in Cray/PGI/XL compile features docs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !971
2017-06-16 09:34:07 -04:00
Michael Stürmer ec7b3af7e7 Vs: remove /nowin32manifest from C# flags to enable default VS behavior
if /nowin32manifest is specified, it will be preferred over any occurring
/win32manifest:<file> parameter

Fixes: #16969, #16970
2017-06-16 09:33:06 +02:00
Kitware Robot 22894747b4 CMake Nightly Date Stamp 2017-06-16 00:01:09 -04:00
Brad King b0725f2fcd Help/dev: Add review instructions to maintainer guide 2017-06-15 14:32:54 -04:00
Brad King aa944c88e3 Check*CompilerFlag: Rewrite documentation of these modules
Format with modern markup.  Clarify that the setting of
`CMAKE_REQUIRED_DEFINITIONS` is temporary.  Add a note warning
about contamination of the checks by `CMAKE_<LANG>_FLAGS`.

Issue: #16973
2017-06-15 13:49:35 -04:00
Brad King 7c5299add4 Merge topic 'doc-test-layout'
1c547152 Tests: Document test directory layout in a README.rst
4e3483c0 Help/dev: Update source code guide to cover source tree layout

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !967
2017-06-15 10:23:38 -04:00
Brad King f3ffd18ab6 Merge topic 'vs_csharp_prop_for_all_extensions'
c90630c5 Vs: add support for VS_CSHARP_* target property for additional file extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !961
2017-06-15 10:22:12 -04:00
Brad King 2afc4bf608 Merge topic 'UseSWIG-avoid-dllimport-repeat'
76a0286b UseSWIG: Add `-dllimport` only if not already specified

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !958
2017-06-15 10:20:08 -04:00
Brad King b7799f07d1 Merge branch 'doc-compile-features' into release-3.9 2017-06-15 10:14:29 -04:00
Brad King c4610df03c Help: Document that VS 2017 compile features are recorded
They were recorded by commit v3.7.0-rc1~156^2~2 (Features: Record
features for VS 15 Preview 4, 2016-09-05).

Fixes: #16974
2017-06-15 10:11:09 -04:00
Brad King 69d50a7edb Help: Fix typo in Cray/PGI/XL compile features docs
Reported-by: Rolf Eike Beer <eike@sf-mail.de>
2017-06-15 10:08:59 -04:00
Brad King 41897b4665 Merge branch 'release-3.9' 2017-06-15 10:06:25 -04:00
Brad King d3b981ab3e Merge topic 'ipo-per-lang'
ba247cca IPO: Consider support for each language separately

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !964
2017-06-15 10:05:02 -04:00
Brad King df6f3ef9a6 Merge topic 'update-curl'
a3ef36f1 Merge branch 'upstream-curl' into update-curl
06d6d6c4 curl 2017-06-14 (54b636f1)
91101f10 curl: Update script to get curl 7.54.1

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !965
2017-06-15 10:03:31 -04:00
Brad King 65834d04a2 Merge topic 'libuv-restore-fmode'
871adefc cmake: Fix default file translate mode when using libuv

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !963
2017-06-15 10:02:56 -04:00
Kitware Robot a0ba798e42 CMake Nightly Date Stamp 2017-06-15 00:01:05 -04:00
Brad King 54c51e792e cmCPackDragNDropGenerator: Drop unused member
Drop the unused `InstallPrefix` member that shadows a member in a
subclass.
2017-06-14 16:34:40 -04:00
Brad King 7b02cb2996 cmCommonTargetGenerator: Rename member to avoid shadowing
Rename the `LocalGenerator` and `GlobalGenerator` members to avoid
shadowing similar members in subclasses that use more-specific pointer
types.
2017-06-14 16:31:20 -04:00
Brad King c1f15e1c79 cmGlobalGenerator: Rename member to avoid shadowing
The `CurrentMakefile` member is shadowed by a generate-time member of
the same name in `cmGlobalXCodeGenerator`.  Rename our member to clarify
its configure-time role and avoid the shadow.
2017-06-14 16:24:45 -04:00
Brad King 877e7383b3 Merge branch 'release-3.9' 2017-06-14 15:11:15 -04:00
Brad King 61c1848cdc Merge branch 'ipo-per-lang' into release-3.9 2017-06-14 15:10:39 -04:00
Brad King df1c187f2f Merge branch 'update-curl' into release-3.9 2017-06-14 15:10:28 -04:00
Brad King 8e32bebd8d Merge branch 'libuv-restore-fmode' into release-3.9 2017-06-14 15:10:20 -04:00
Brad King fdacfc6604 Merge branch 'add-missing-compiler-release-notes' into release-3.9 2017-06-14 15:10:12 -04:00
Brad King 1c5471527e Tests: Document test directory layout in a README.rst
Cross-reference the CMake Source Code Guide document.
Also drop the outdated `Tests/README` file.
2017-06-14 15:04:19 -04:00
Brad King 4e3483c007 Help/dev: Update source code guide to cover source tree layout 2017-06-14 15:03:50 -04:00
Brad King a7cbc5f245 Merge topic 'add-missing-compiler-release-notes'
28756437 Help: Add docs for new compilers supporting language standards.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !966
2017-06-14 14:12:47 -04:00
Brad King 871adefce9 cmake: Fix default file translate mode when using libuv
On Windows, libuv's one-time initialization changes the C runtime
library's  `_fmode` setting to `_O_BINARY`, thus causing files to open
as binary after that instead of the default `_O_TEXT` mode.  See
upstream libuv issue 840.  Work around the problem by performing libuv
initialization early and then restoring `_fmode`.

In particular, this currently affects server mode.  Without this fix,
the `_fmode` setting changes when the server mode initializes libuv.

Fixes: #16962
2017-06-14 12:46:03 -04:00
Brad King c8b4da5838 Merge topic 'vs-dotnet-custom-reference-tags'
07ec212a VS: add target property VS_DOTNET_REFERENCEPROP_<refname>_TAG_<tagname>

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !960
2017-06-14 12:43:34 -04:00