Commit Graph

37144 Commits

Author SHA1 Message Date
Brad King
c6f9c6f67a Merge branch 'release-3.9' 2017-09-06 10:50:35 -04:00
Brad King
354835bd73 Merge topic 'static_cast'
353ec237 use static_cast<> for casts from void*

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1225
2017-09-06 10:48:44 -04:00
Brad King
ff0847b2d5 Merge topic 'FindBoost-fix-policy-scope'
ade45fa3 FindBoost: Revert "Simplify search in lists."

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1238
2017-09-06 10:47:49 -04:00
Brad King
e4a78435c1 Merge topic 'findopenmp-found'
91fbda82 FindOpenMP: Restore OpenMP_FOUND result variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1233
2017-09-06 10:47:31 -04:00
Brad King
faacd46d39 Merge topic 'android-ndk-r16'
5a1a1177 Android: Update for NDK r16

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Daniel Seither <d@fdseither.de>
Merge-request: !1237
2017-09-06 10:46:38 -04:00
Brad King
932ba44f07 Merge topic 'csharp_fix_initial_flags'
a3388900 VS: Initialize CSharp flags consistently

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1232
2017-09-06 10:46:11 -04:00
Brad King
70a2a5d1e0 Merge topic 'vs-csharp-ref-no-asm'
94e70e53 Merge branch 'backport-vs-csharp-ref-no-asm' into vs-csharp-ref-no-asm
7e57e6ae VS: Do not reference output assemblies if not possible for CSharp target

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1203
2017-09-06 10:45:38 -04:00
Kitware Robot
8362db82ec CMake Nightly Date Stamp 2017-09-06 00:01:15 -04:00
Brad King
55c4b6818e Merge branch 'FindBoost-fix-policy-scope' into release-3.9
Merge-request: !1238
2017-09-05 14:10:32 -04:00
Brad King
ade45fa342 FindBoost: Revert "Simplify search in lists."
Revert commit v3.9.0-rc1~41^2 (FindBoost: Simplify search in lists,
2017-04-23).  It regressed the module by exposing issue #17257, but the
fix for that issue is not suitable for inclusion in a patch release.
It is simplest to revert the commit until the larger problem can be
addressed.

Fixes: #17252
2017-09-05 14:04:51 -04:00
Brad King
dfc11d71bd Merge branch 'android-ndk-r16' into release-3.9
Merge-request: !1237
2017-09-05 12:54:45 -04:00
Brad King
5a1a1177bf Android: Update for NDK r16
Since NDK commit 90ec78ffd96b87cd75d82575587ead14d6494df1 (Remove Clang
toolchain path from setup.mk, 2017-05-31) the `setup.mk` files for Clang
no longer hold the path to the `toolchains/llvm` directory.  It has been
the same since NDK r11, so use that as the default.

Fixes: #17253
2017-09-05 12:52:09 -04:00
Brad King
27816fa741 Merge branch 'csharp_fix_initial_flags' into release-3.9
Merge-request: !1232
2017-09-05 09:58:53 -04:00
Michael Stürmer
a3388900f8 VS: Initialize CSharp flags consistently
Use the same environment variable for the initial flags that we
use for the compiler id.

Fixes: #17250
2017-09-05 09:58:43 -04:00
Brad King
741eca9c6c Merge branch 'findopenmp-found' into release-3.9
Merge-request: !1233
2017-09-05 09:54:55 -04:00
Christian Pfeiffer
91fbda8247 FindOpenMP: Restore OpenMP_FOUND result variable
The overhaul in commit v3.9.0-rc1~207^2~1 (FindOpenMP: Complete
overhaul, 2017-04-24) documented this variable but accidentally left it
unset.

Fixes: #17251
2017-09-05 09:54:48 -04:00
Brad King
2ce84615f1 Merge branch 'backport-vs-csharp-ref-no-asm' into release-3.9
Merge-request: !1203
2017-09-05 09:43:24 -04:00
Brad King
94e70e5329 Merge branch 'backport-vs-csharp-ref-no-asm' into vs-csharp-ref-no-asm 2017-09-05 09:42:16 -04:00
Michael Stürmer
7e57e6ae12 VS: Do not reference output assemblies if not possible for CSharp target
Since commit v3.9.0-rc4~4^2 (Vs: allow CSharp targets to be linked to
CXX targets, 2017-06-20) CSharp targets get `ProjectReference` entries
to their dependencies.  This causes VS to also reference the
dependency's output assembly by default, which is incorrect for
non-managed targets.

Fix this by setting `ReferenceOutputAssembly` to `false` for targets
that can't provide output assemblies.  Unmanaged C++ targets (shared
libs & executables) can still be referenced and a warning will be shown
in the IDE but the build will not break anymore.

Fixes: #17172
2017-09-05 09:41:40 -04:00
Brad King
20e5f7a9c9 Merge topic 'ExternalProject-command'
15617484 ExternalProject: Prevent COMMAND from being treated as a true keyword

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1178
2017-09-05 09:31:06 -04:00
Brad King
4defa6c21c Merge topic 'add-FindPatch-module'
2645cb62 FindPatch: Add module to find 'patch' command-line tool

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1184
2017-09-05 09:28:40 -04:00
Brad King
e7de2a7def Merge topic 'update-kwsys'
cbf20178 Merge branch 'upstream-KWSys' into update-kwsys
37760743 KWSys 2017-09-01 (aee0cf59)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1223
2017-09-05 09:27:22 -04:00
Kitware Robot
ad1b9eba85 CMake Nightly Date Stamp 2017-09-05 00:01:05 -04:00
Kitware Robot
8d13e9c1f5 CMake Nightly Date Stamp 2017-09-04 00:01:10 -04:00
Kitware Robot
de64329232 CMake Nightly Date Stamp 2017-09-03 00:01:04 -04:00
Craig Scott
1561748496 ExternalProject: Prevent COMMAND from being treated as a true keyword
The known keywords for each function are obtained by scraping the
documentation for lines matching a particular regular expression. In
commit 8842a027 (ExternalProject: Improve documentation, 2017-07-09),
the docs were overhauled and the COMMAND docs subsequently matched the
regular expression when they shouldn't have. This made COMMAND appear as
a true keyword, which thwarted the special handling logic elsewhere for
the intended use of COMMAND arguments.

This commit contains a workaround for issue #17229 to force a dependency
of the patch step on the update step to ensure a predictable step order.

Fixes: #17198
2017-09-02 17:53:16 +10:00
Kitware Robot
dd9d0ef83f CMake Nightly Date Stamp 2017-09-02 00:01:07 -04:00
Rolf Eike Beer
353ec23737 use static_cast<> for casts from void* 2017-09-01 20:50:00 +02:00
Jean-Christophe Fillion-Robin
2645cb6208 FindPatch: Add module to find 'patch' command-line tool 2017-09-01 11:46:28 -04:00
Brad King
cbf2017822 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-09-01 (aee0cf59)
2017-09-01 10:35:19 -04:00
KWSys Upstream
37760743fc KWSys 2017-09-01 (aee0cf59)
Code extracted from:

    https://gitlab.kitware.com/utils/kwsys.git

at commit aee0cf59bbed8c8ccc07fa3d77760024cdca520a (master).

Upstream Shortlog
-----------------

Steven Velez (1):
      80652055 Directory: Use Windows Extended Paths
2017-09-01 10:35:18 -04:00
Brad King
671cc7490c Merge topic 'server-refactor'
0e4d5033 server: Added thread check to protect writedata
124424e9 server: Protect several fields from potentially pointing to bad memory
693fa0a9 server: Added assert to monitor uv_run status
882dcef8 server: Made connections in a server have a mutex to avoid use after frees
7ef28843 server: Moved buffer formatting into bufferstrategy
dc7a18d8 server: test buffer parsing
f8fd5a97 server: Made stdio connection accept different types of streams
6afc7f88 server: Remove unused fields / functions
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1111
2017-09-01 10:34:16 -04:00
Brad King
900f75868c Merge topic 'flang'
d8e03e9b FindOpenMP: Add Flang flag.
2f3a07a9 Flang: Add support for flang Fortran compiler

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1141
2017-09-01 10:33:15 -04:00
Brad King
4f68692807 Merge topic 'vs-std-cxx17-flag-map'
a46024be VS: Add v141 flag table entry for -std:c++17

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1221
2017-09-01 10:26:44 -04:00
Brad King
b568a18997 Merge topic 'tll-global-unknown-lib'
a47a8533 target_link_libraries: Allow linking to UNKNOWN IMPORTED GLOBAL libs

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1220
2017-09-01 10:26:08 -04:00
Brad King
bd77717800 Merge topic 'fix-genex-SOURCES'
068cc545 Genex: Fix TARGET_PROPERTY value of SOURCES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1218
2017-09-01 10:25:08 -04:00
Brad King
2820de210b Merge branch 'fix-genex-SOURCES' into release-3.9
Merge-request: !1218
2017-09-01 10:24:12 -04:00
Brad King
068cc545d9 Genex: Fix TARGET_PROPERTY value of SOURCES
Refactoring in commit v3.8.0-rc1~445^2~2 (cmTarget: Move sanity checks
and computed property access to callers, 2016-10-13) exposed a typo in
commit v3.8.0-rc1~445^2~3 (cmGeneratorTarget: Implement
cmTargetPropertyComputer interface, 2016-10-13).  Together they broke
the `$<TARGET_PROPERTY:mytgt,SOURCES>` generator expression in the case
that the `SOURCES` target property is populated in part by the
`target_sources` command.  Add the missing `;`-separator.

Fixes: #17243
2017-09-01 10:23:37 -04:00
Brad King
9a509099f7 Merge topic 'FindThreads-cross-compile-no-try_run'
d4e551a9 FindThreads: Drop try_run to improve cross-compiling support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1109
2017-09-01 10:21:23 -04:00
Kitware Robot
d75ccb1ce0 CMake Nightly Date Stamp 2017-09-01 00:01:08 -04:00
Justin Berger
0e4d503384 server: Added thread check to protect writedata 2017-08-31 15:35:46 -04:00
Justin Berger
124424e997 server: Protect several fields from potentially pointing to bad memory 2017-08-31 15:35:46 -04:00
Justin Berger
693fa0a96e server: Added assert to monitor uv_run status 2017-08-31 15:35:46 -04:00
Justin Berger
882dcef8e0 server: Made connections in a server have a mutex to avoid use after frees 2017-08-31 15:35:44 -04:00
Justin Berger
7ef2884361 server: Moved buffer formatting into bufferstrategy 2017-08-31 15:35:04 -04:00
Justin Berger
dc7a18d82e server: test buffer parsing 2017-08-31 15:35:04 -04:00
Justin Berger
f8fd5a979c server: Made stdio connection accept different types of streams 2017-08-31 15:35:04 -04:00
Justin Berger
6afc7f8828 server: Remove unused fields / functions 2017-08-31 15:35:03 -04:00
Justin Berger
1a50cd8c68 server: Fixed minor memory leaks 2017-08-31 15:35:03 -04:00
Justin Berger
546a587469 server: Fixed mismatched new/delete; added proper shutdown procedure 2017-08-31 15:35:03 -04:00