Commit Graph

34371 Commits

Author SHA1 Message Date
Brad King 2bba0bfc2c file: Fix crash on GLOB with no expressions after LIST_DIRECTORIES
Since commit v3.3.0-rc1~318^2~1 (file: Teach GLOB to list directories
optionally, 2015-03-17) using `LIST_DIRECTORIES` followed by no
expression causes a crash.  Fix the logic to avoid the crash.

Fixes: #16565
2017-01-16 10:47:32 -05:00
Brad King 85a8939e2f Merge topic 'docs-function-exists'
4ae2dcb1 CheckFunctionExists: Document suggestion to use CheckSymbolExists instead.
2017-01-13 14:07:17 -05:00
Brad King 63e550e54f Merge branch 'release' 2017-01-13 10:19:00 -05:00
Brad King 35413bf2c1 CMake 3.7.2 v3.7.2 2017-01-13 08:58:58 -05:00
Kitware Robot 7f5842d7d9 CMake Nightly Date Stamp 2017-01-13 00:01:05 -05:00
Stephen Sorley 4ae2dcb1b9 CheckFunctionExists: Document suggestion to use CheckSymbolExists instead.
CheckFunctionExists has some severe limitations that are overcome by
CheckSymbolExists.  Document them and suggest the alternative.
2017-01-12 15:52:53 -05:00
Brad King 728820f3ea Merge topic 'cuda-windows'
f9a810f7 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
5599d858 CUDA: Port test cases to Windows with MSVC host compiler
11551702 CUDA: Populate NVIDIA compiler information on Windows
5365421e CUDA: Detect implicit link information on Windows
522b913f CUDA: Find MSVC binutils on Windows
02582b91 CUDA: Populate compiler PDB placeholder during device linking
d470cb70 CUDA: Use `.obj` object file extension on Windows
a2e80cb0 CUDA: Detect MSVC architecture id
65c1e012 CUDA: Detect use of MSVC host compiler
945dd207 CUDA: Allow platform files to set device linking rules
95420cea CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc
2017-01-12 10:41:57 -05:00
Brad King f9a810f7b3 CUDA: Enable CudaOnly.SeparateCompilation test runtime calls
Uncomment the calls in `main.cpp` (and fix the signatures).
2017-01-12 10:39:04 -05:00
Brad King 5599d858c7 CUDA: Port test cases to Windows with MSVC host compiler 2017-01-12 10:39:04 -05:00
Brad King 1155170230 CUDA: Populate NVIDIA compiler information on Windows
Port Windows-specific compilation and linking rules over from the
`Platform/Windows-MSVC` module and adapt it for NVIDIA CUDA.  On Windows
nvcc and its host compiler (MSVC) do not understand or use options like
`-fPIC` or `-std=`, so condition those out.
2017-01-12 10:39:04 -05:00
Brad King 5365421e84 CUDA: Detect implicit link information on Windows
The `nvcc -v` output on Windows uses response files, so load the one we
need to extract the full link line.
2017-01-12 10:39:03 -05:00
Brad King 522b913f43 CUDA: Find MSVC binutils on Windows
On Windows the host link launcher is just `link.exe`.  Find and use that
instead of trying to extract the launcher from the `nvcc -v` output.
2017-01-12 10:39:03 -05:00
Brad King 02582b91ad CUDA: Populate compiler PDB placeholder during device linking
The device link step runs the host compiler internally so we need to use
the proper compiler PDB file with MSVC.
2017-01-12 10:39:03 -05:00
Brad King d470cb7007 CUDA: Use .obj object file extension on Windows 2017-01-12 10:39:02 -05:00
Brad King a2e80cb085 CUDA: Detect MSVC architecture id 2017-01-12 10:39:02 -05:00
Brad King 65c1e012ff CUDA: Detect use of MSVC host compiler
Report it in `CMAKE_CUDA_SIMULATE_{ID,VERSION}`.
2017-01-12 10:39:02 -05:00
Brad King 945dd207b6 CUDA: Allow platform files to set device linking rules
Condition the default settings on the rule variables not already being
set.
2017-01-12 10:39:02 -05:00
Brad King 95420cea5e CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvcc 2017-01-12 10:39:01 -05:00
Brad King 9f3eff6f56 Merge branch 'release' 2017-01-12 10:24:53 -05:00
Brad King 889fe63b51 Merge topic 'launcher-tests'
4b0c13a8 Tests: Add additional launcher tests
2017-01-12 10:22:08 -05:00
Brad King 51255a7c7a Merge topic 'asan_overriding_user_options'
efff7086 ctest_memcheck: Append sanitizers user options at the end to allow overriding
2017-01-12 10:22:04 -05:00
Brad King e31986b900 Merge topic 'InstallRequiredSystemLibraries-UCRT-configs'
e0ed1de4 InstallRequiredSystemLibraries: Distinguish UCRT install configurations
2017-01-12 10:21:56 -05:00
Brad King bc09abd7d0 Merge topic 'get_prerequisites_delayload'
a7c5d5fb GetPrerequisites: Exclude delay load dependencies on Windows
2017-01-12 10:21:30 -05:00
Brad King b4f7ce5c79 Merge topic 'fix_get_prerequisites'
17a0703d GetPrerequisites: Do not fail on files we cannot find
2017-01-12 10:21:24 -05:00
Brad King 5e76ded22c Merge topic 'cuda_compile_features_test_use_widely_supported_feature'
1ce39a1e CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support
2017-01-12 10:21:15 -05:00
Brad King 2e550e36d2 Merge topic 'FindJava-jre-hints'
eb728d26 FindJava: add hints for jre
2017-01-12 10:21:07 -05:00
Brad King 88a816c6b9 Merge topic 'vs15-detect-from-installer'
3a97a371 VS: Port Visual Studio Setup third-party header to older VS versions
c93e85d8 VS: Use Visual Studio Installer to locate VS 2017
18c8278b VS: Add helper class to interact with Visual Studio Installer
d47bda00 VS: Fix VS 2017 Windows Store toolset selection
efdfc26e VS: Drop check for VS 15 Express Edition
ad5b702c VS: Port Visual Studio Setup third-party header to MinGW
def7395f VS: Add Visual Studio Setup third-party header
2017-01-12 10:20:48 -05:00
Brad King e15106b2f1 Merge topic 'cmListFileLexer-warning-fix'
6e6253ea cmListFileLexer: Fix signature of cmListFileLexer_New
2017-01-12 10:20:45 -05:00
Brad King 097b47b972 Merge topic 'dont-include-CMakeParseArguments'
d6877e6c Don't include CMakeParseArguments
2017-01-12 10:20:41 -05:00
Brad King ec09e91a65 Merge topic 'cmake-install-infix'
0315ab7a Add installation infix (empty by default)
2017-01-12 10:20:38 -05:00
Brad King 592c8cfd93 Merge topic 'add-cpack-ifw-configure-file'
6310f7c3 Add cpack_ifw_configure_file command
2017-01-12 10:20:33 -05:00
Brad King 082456e5a3 Merge topic 'codeblocks-nmake-makefiles-jom'
3462118c Allow CodeBlocks for NMake Makefiles JOM
2017-01-12 10:20:27 -05:00
Brad King c9a0b14153 Merge topic 'cmFileMonitor-skip-empty-names'
7bad99b0 cmake-server: Do not try watching subdirectories with empty names
2017-01-12 10:20:21 -05:00
Kitware Robot 053adc60ee CMake Nightly Date Stamp 2017-01-12 00:01:06 -05:00
Brad King 0051989738 Merge branch 'cmFileMonitor-skip-empty-names' into release 2017-01-11 13:51:38 -05:00
Aleix Pol 7bad99b0d3 cmake-server: Do not try watching subdirectories with empty names
`cmsys::SystemTools::SplitPath` will return empty segments on paths
where there's duplicaded consequent slashes (e.g.  `/home/dir/my//stuff`).
This makes the cmFileWatcher choke.  Teach cmFileMonitor to skip these
empty segments.

Closes: #16531
2017-01-11 13:48:41 -05:00
Sylvain Joubert efff7086c6 ctest_memcheck: Append sanitizers user options at the end to allow overriding 2017-01-11 19:27:45 +01:00
Bjoern Thiel e0ed1de4fb InstallRequiredSystemLibraries: Distinguish UCRT install configurations
Teach the `CMAKE_INSTALL_UCRT_LIBRARIES` feature to honor the
`CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY` and `CMAKE_INSTALL_DEBUG_LIBRARIES`
settings.

Closes: #16542
2017-01-11 11:20:47 -05:00
Martin Koegler 17a0703d20 GetPrerequisites: Do not fail on files we cannot find
Historically we have always warned and skipped missing files.  Since
commit v3.4.0-rc1~264^2~1 (GetPrerequisites: Add error checks for
execute_process() calls, 2015-07-29) we fail instead, but this was not
an intentional part of that change.  Restore the warn-only behavior so
that missing system libraries (e.g. during cross-compiling) do not cause
failure.

Closes: #16523
2017-01-11 10:57:04 -05:00
Pascal Thomet a7c5d5fb0e GetPrerequisites: Exclude delay load dependencies on Windows
With some Windows toolchains we use `objdump` which does not mention
delay load dependencies in its output.  Therefore, to get consistent
behavior we should always ignore them.

Use the `dumpbin` message "Image has the following delay load
dependencies" that precedes the delay load dependencies to recognize and
skip them.  Fortunately, this message is not translated to the current
locale (at least on "Windows 7 French", "Windows 10 French" and "Windows
Server 2008 R2 French").

Fixes: #16241
2017-01-11 10:48:36 -05:00
Robert Maynard 1ce39a1e73 CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support
We need to use a C++11 feature that is supported by the widest
range of compilers, so we chose nullptr instead of constexpr.
2017-01-11 10:40:38 -05:00
Brad King e0cc40ed58 Merge branch 'release' 2017-01-11 10:35:26 -05:00
Rechi Rechi eb728d266e FindJava: add hints for jre 2017-01-11 16:31:01 +01:00
Brad King 12d5ccd10a Merge topic 'ctest_memcheck-leak_sanitizer'
e537bd91 ctest_memcheck: do not add detect_leaks=1 to ASAN_OPTIONS
0a2e5885 ctest_memcheck: join *SAN_OPTIONS with :
cdacfbd2 MEMORYCHECK_SUPPRESSIONS_FILE: add support for sanitizers
cf590c12 ctest_memcheck: add support for standalone LeakSanitizer
2017-01-11 09:58:55 -05:00
Brad King 9a67022275 Merge topic 'UseSWIG-implicit-depends'
b8968b4b UseSWIG: Automatically scan dependencies of SWIG files for Makefiles
2017-01-11 09:58:52 -05:00
Brad King bc2cc80255 Merge topic 'solaris-build-fixes'
b7f0b124 libuv requires _XOPEN_SOURCE 600 on Solaris 11
ba8bb321 Disable libuv on Solaris 10
2017-01-11 09:58:49 -05:00
Brad King 474edf75f6 Merge topic 'BundleUtilities-symlink-structure'
b1dc4ddb BundleUtilities: Maintain symlink structure
2017-01-11 09:58:46 -05:00
Brad King 039588e335 Merge topic 'cpack-rpm-user-binary-spec-file-test'
af77368e CPack/RPM test for using custom binary spec file
2017-01-11 09:58:43 -05:00
Brad King 2eb5596503 Merge topic 'Autogen_Simplify'
7db05f42 AUTOGEN: Release notes for SKIP_AUTOX
6eabac26 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC
cbc07d33 AUTOGEN: Documentation for SKIP_AUTOX source file properties
c17e0a3a AUTOGEN: Tests: AUTORCC SKIP_AUTORCC and SKIP_AUTOGEN test
53787bf8 AUTOGEN: Tests: AUTOUIC SKIP_AUTOUIC and SKIP_AUTOGEN test
8dbdd3e7 AUTOGEN: Tests: AUTOMOC SKIP_AUTOMOC and SKIP_AUTOGEN test
0699760d AUTOGEN: Generators: Do moc/uic skip test during file list generation
a84f0bb7 AUTOGEN: Generators: Message upper/lower case unification
7b766b83 AUTOGEN: Generators: Use single moc/uic skip test method only
2964b8cc AUTOGEN: Generators: Use AUTOMOC/UIC/RCC instead of AUTOGEN in messages
d58b6bf3 AUTOGEN: Generators: Moc/UicSkipTest methods
94c319f9 AUTOGEN: Generators: Use separate header lists for MOC and UIC
966be439 AUTOGEN: Generators: Be verbose about skipping files
de531432 AUTOGEN: Generators: Remove unused variable
d8e45536 AUTOGEN: Initializer: Always remember skipped files
d9313a82 AUTOGEN: Initializer: Enable SKIP_AUTOGEN on all AUTOGEN generated sources
...
2017-01-11 09:58:40 -05:00
Brad King d1682a8514 Merge topic 'android_clang_asm'
524f5ee1 Android: Set compiler target platform when compiling ASM with Clang
2017-01-11 09:58:37 -05:00