Commit Graph

36040 Commits

Author SHA1 Message Date
Brad King b86c5e8003 Merge topic 'fix-invalid-export-name'
8d754ad5 bindexplib: Skip symbols containing a dot (.)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !855
2017-05-18 08:50:47 -04:00
Brad King 23b3d46e96 Merge topic 'update-kwsys'
16ebd9f6 Merge branch 'upstream-KWSys' into update-kwsys
7be70ca6 KWSys 2017-05-16 (fe1f22ce)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !856
2017-05-18 08:48:48 -04:00
Brad King cb8325fb4a Merge topic 'ninja-compile_commands.json'
b554caf7 Ninja: List compile_commands.json as generated by CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !849
2017-05-18 08:47:47 -04:00
Brad King 3738871626 Merge topic 'removeSetModulePath'
0fb0f346 Tests: Remove unnecessary setting of CMAKE_MODULE_PATH

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !853
2017-05-18 08:47:04 -04:00
Brad King 6b1e35d207 Merge topic 'gtest_add_tests'
6edd1806 GoogleTest: Expand capabilities of gtest_add_tests()

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !839
2017-05-18 08:46:02 -04:00
Brad King d7e32c1cd6 Merge topic 'update-libuv'
223d92e0 libuv: Update build within CMake
ed17516b Merge branch 'upstream-libuv' into update-libuv
12a78bc8 libuv 2017-05-09 (e11dcd43)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !847
2017-05-18 08:43:17 -04:00
Kitware Robot d1233a38cb CMake Nightly Date Stamp 2017-05-18 00:01:04 -04:00
Brad King 2e6cbd9871 Merge topic 'note-unstage-before-update'
1c25adb2 Help/dev: note that unstaging before an update is unnecessary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !863
2017-05-17 15:10:54 -04:00
Ben Boeckel 1c25adb210 Help/dev: note that unstaging before an update is unnecessary 2017-05-17 13:05:00 -04:00
Kitware Robot 3f25f873f8 CMake Nightly Date Stamp 2017-05-17 00:01:05 -04:00
Brad King 16ebd9f615 Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
  KWSys 2017-05-16 (fe1f22ce)
2017-05-16 11:39:01 -04:00
KWSys Upstream 7be70ca6cc KWSys 2017-05-16 (fe1f22ce)
Code extracted from:

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

at commit fe1f22ceefdae18df33e5bab8483fec7a82d4cee (master).

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

Adam Weisi (3):
      8a799e36 Process: Improve definition ordering in header file
      7d56ef24 Process: Save results from all children internally
      b7eba998 Process: Add APIs to get results of individual processes

Ben Boeckel (2):
      cea71543 style: remove separator comments
      874dc559 style: help clang-format near macros
2017-05-16 11:39:00 -04:00
Brad King 6b05e028f1 Merge branch 'release' 2017-05-16 11:33:02 -04:00
Albert Ziegenhagel 8d754ad5e7 bindexplib: Skip symbols containing a dot (.)
Symbols including a dot are not valid and result in a `LNK1242` error
when trying to create a library from the def file.  Such symbols happen
to be in object files when using PGI Fortran on Windows and compiling
with debug symbols enabled.  Those symbols do not need to be exported.
2017-05-16 11:22:48 -04:00
Kevin Puetz b554caf753 Ninja: List compile_commands.json as generated by CMake
This fixes a false-positive `CMP0058` warning if any custom rules depend
on `compile_commands.json` (e.g. to trigger rerunning clang-tooling
utilities).

Fixes: #16444
2017-05-16 10:21:22 -04:00
Brad King e69e4448fb Merge topic 'xcode-try_compile-scheme'
c608000a Xcode: Work around xcodebuild spurious hangs in try_compile
b8e707a6 Xcode: Refactor internal decision for scheme generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !850
2017-05-16 09:57:47 -04:00
Brad King 8475734cb3 Merge topic 'early-config-name'
eeb47fbe cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !848
2017-05-16 09:55:51 -04:00
Brad King ef8ac5ad5a Merge topic 'cpackifw-i18n'
72ac7ad9 CPackIFW: Internationalization Support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !748
2017-05-16 09:55:29 -04:00
Brad King 0789a8be08 Merge topic 'extra-fphsa-space'
3c515e19 FPHSA: remove extra space

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !843
2017-05-16 09:54:09 -04:00
Brad King 80e0ef4082 Merge topic 'GNU-FindBinUtils-patterns'
75accaae GCC: more patterns for ar/ranlib

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !838
2017-05-16 09:53:32 -04:00
Brad King 67d5593efa Merge topic 'mingw-w64-compile'
9557b403 cmFileCommand: Fix build on mingw-w64
845f5e3c bootstrap: fix build on mingw-w64

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !837
2017-05-16 09:52:42 -04:00
Brad King 252c2f5ee2 Merge topic 'vs_fix_cpp_debugging_with_cs_enabled'
a6b39a5a VS: Fix debugging of C++ executables if CSharp is enabled

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !844
2017-05-16 09:51:51 -04:00
Brad King 300979e788 Merge topic 'FindOpenSSL-crypto-only'
8b410453 FindOpenSSL: Restore support for crypto-only result

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !846
2017-05-16 09:49:05 -04:00
Brad King 46f48467c5 Merge topic 'FindDevIL-compat'
e8f0385f FindDevIL: Restore IL_FOUND result variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !845
2017-05-16 09:47:50 -04:00
Brad King 223d92e0f9 libuv: Update build within CMake
Update our CMake build rules to account for upstream changes.
2017-05-16 07:52:56 -04:00
Kitware Robot 1867856f6a CMake Nightly Date Stamp 2017-05-16 00:01:05 -04:00
Craig Scott 0fb0f346c0 Tests: Remove unnecessary setting of CMAKE_MODULE_PATH 2017-05-16 08:05:32 +10:00
Craig Scott 6edd1806dd GoogleTest: Expand capabilities of gtest_add_tests()
Now has keyword-based arguments (old syntax form is still supported).
Discovered tests can have a prefix and/or suffix added to the test names
and the list of discovered tests is available to the caller. The working
dir can also be set and the dependency on the source files is now
optional instead of mandatory.
2017-05-16 07:57:27 +10:00
Brad King 4fd61a60f1 Merge branch 'mingw-w64-compile' into release 2017-05-15 14:26:55 -04:00
Aleksey Chernov 9557b403f5 cmFileCommand: Fix build on mingw-w64
Include header needed for `CP_ACP`.
2017-05-15 14:25:37 -04:00
Brad King c608000a2a Xcode: Work around xcodebuild spurious hangs in try_compile
`xcodebuild` occasionally hangs on some macOS machines (and can be
reproduced independent of CMake).  It only happens a few times in 1000
runs, but configuration of a large project calls `try_compile` many
times and therefore frequently hangs due to this problem.  I've been
unable to reproduce the hang when using a scheme to build, so always
generate a scheme in `try_compile` projects to work around the problem.

Issue: #16752
2017-05-15 13:05:46 -04:00
Brad King b8e707a6a1 Xcode: Refactor internal decision for scheme generation
Move the Xcode version check out to wrap everything.
2017-05-15 13:02:09 -04:00
Brad King eeb47fbeb2 cmLocalCommonGenerator: Save CMAKE_BUILD_TYPE on construction
Copy the value to our `ConfigName` member on construction to ensure it
is available even to code paths that run before `Generate`.  We once
needed to delay this lookup until `Generate` because the local
generators were at one time created before `Configure`.  Now they are
created at generate time which is late enough to expect
`CMAKE_BUILD_TYPE` to be available.

Without this, `cmGlobalUnixMakefileGenerator3::WriteConvenienceRules`
causes use of `ConfigName` before it is populated which breaks use of
source files that depend on the `$<CONFIG>` generator expression.

Fixes: #16889
2017-05-15 11:51:57 -04:00
Aleksey Chernov 845f5e3c51 bootstrap: fix build on mingw-w64
Define the default code page for EncodingCXX too.
2017-05-15 11:13:07 -04:00
Brad King 7ab585dbc2 Merge branch 'vs_fix_cpp_debugging_with_cs_enabled' into release 2017-05-15 11:02:43 -04:00
Michael Stürmer a6b39a5adf VS: Fix debugging of C++ executables if CSharp is enabled
Fixes: #16867
2017-05-15 11:02:15 -04:00
Brad King 4717797647 Merge topic 'fix-target-alias-doc-typo'
6a6cbd47 Help: Fix typo in add_library(... ALIAS ...) text

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !840
2017-05-15 10:57:41 -04:00
Brad King dd89b24b9b Merge topic 'autogen_settings'
b95fbbe5 Autogen: Add -DWIN32 to definitions list on demand
ab39dd11 Autogen: Include moc/uic/rcc binary in settings hash

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !836
2017-05-15 10:57:20 -04:00
Brad King bedd098a65 Merge topic 'cpack-components-handle-symlinks'
26384068 CPack test symlinks in package
6949b71f CPack unify component/monolithic package symlink handling
3eb0f080 Improved CPack tests error logging

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !841
2017-05-15 10:55:58 -04:00
Brad King cda0baea49 Merge topic 'FindPkgConfig-fix-lib-search'
2e293c39 FindPkgConfig: Fix pkg_check_modules() non-standard location search

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !835
2017-05-15 10:55:10 -04:00
Brad King ed17516b31 Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
  libuv 2017-05-09 (e11dcd43)

Fixes: #16878
2017-05-15 10:43:50 -04:00
libuv upstream 12a78bc824 libuv 2017-05-09 (e11dcd43)
Code extracted from:

    https://github.com/libuv/libuv.git

at commit e11dcd4377185359874e67f4962995fdb7e83d19 (v1.x).
2017-05-15 10:43:03 -04:00
Brad King 9f2a68ac9b Merge branch 'FindOpenSSL-crypto-only' into release 2017-05-15 10:14:56 -04:00
Brad King 8b41045393 FindOpenSSL: Restore support for crypto-only result
Since commit v3.8.0-rc1~132^2 (FindOpenSSL: Check that both CRYPTO and
SSL libraries are present, 2017-01-03) we require both crypto and ssl
libraries to be present.  This makes sense because `OPENSSL_LIBRARIES`
lists both and breaks when one is not found.  However, prior to that
fix we supported finding only the crypto library and using it through
the imported target.  Drop the requirement for ssl to restore support
for using crypto alone.

Later this module should be taught to support the `COMPONENTS` argument
of `find_package`.

Fixes: #16882
2017-05-15 10:12:46 -04:00
Brad King 6bcb198023 Merge branch 'FindDevIL-compat' into release 2017-05-15 09:57:03 -04:00
Brad King e8f0385f41 FindDevIL: Restore IL_FOUND result variable
The fix in commit v3.8.0-rc1~257^2~1 (FindDevIL: fail properly when
library is not found, 2016-11-24) removed the previously-provided
`IL_FOUND` result variable.  Set it for compatibility and update the
documentation to mention the new variable.

Fixes: #16881
2017-05-15 09:56:41 -04:00
Ben Boeckel 3c515e1922 FPHSA: remove extra space
Each missing variable is added to the string as " ${var}" which causes
the string to always have a leading space. Remove the duplicate space
due to this in the output.
2017-05-15 09:23:29 -04:00
Kitware Robot 52fbae0a59 CMake Nightly Date Stamp 2017-05-15 00:01:03 -04:00
Domen Vrankar 2638406813 CPack test symlinks in package 2017-05-14 23:45:18 +02:00
Domen Vrankar 6949b71ff1 CPack unify component/monolithic package symlink handling
Non component package generation was recursing through
symlinks while monolithic package generation did not.
This was causing component archive packages to contain
both symlink and a directory with the same name on the
same level if symlink contained files which caused errors
during extraction of such packages.

Closes #16051
2017-05-14 23:45:18 +02:00