Commit Graph

34350 Commits

Author SHA1 Message Date
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
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
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
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
Brad King
445ab80c44 Merge topic 'AndroidTestUtilities-fix-cleanup'
513ef514 AndroidTestUtilities: fix cleanup operation
2017-01-11 09:58:34 -05:00
Brad King
34745595c3 Merge topic 'issue-16513-concrt140-dll'
3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0
2017-01-11 09:58:31 -05:00
Brad King
0884c9e46a Merge topic 'SublimeText-no-VERBOSE'
154def30 Sublime: Do not build with verbose output
2017-01-11 09:58:28 -05:00
Brad King
ff6a034e0b Merge topic 'FindOpenSSL-check-both'
696339a9 FindOpenSSL: Check that both CRYPTO and SSL libraries are present
2017-01-11 09:58:25 -05:00
Brad King
396e9378a8 Merge topic 'pgsql-yum'
5ffee691 FindPostgreSQL: automatically find installations from yum.postgresql.org
2017-01-11 09:58:22 -05:00
Brad King
a8b576244f Merge topic 'FindBoost-1.63'
a9b93501 FindBoost: Add support for 1.63
2017-01-11 09:58:17 -05:00
Brad King
1406408e61 Merge topic 'FindGTest-fixups'
8deb913d FindGTest: add lib search path for MSVC x64 platform
eadd395a FindGTest: Fix documented GTEST_MSVC_SEARCH default value
2017-01-11 09:58:14 -05:00
Brad King
22dfda1112 Merge topic 'FindBoost-find-default'
ff91b151 FindBoost: Search official location of prebuilt binaries on Windows
2017-01-11 09:58:11 -05:00
Brad King
3a97a3713a VS: Port Visual Studio Setup third-party header to older VS versions 2017-01-11 09:45:05 -05:00
Brad King
6e6253ea88 cmListFileLexer: Fix signature of cmListFileLexer_New
Add explicit `(void)` instead of an empty argument list, as suggested
by `-Wstrict-prototypes`.
2017-01-11 09:32:00 -05:00
Sebastian Holtermann
7db05f426e AUTOGEN: Release notes for SKIP_AUTOX 2017-01-11 09:25:48 -05:00
Sebastian Holtermann
6eabac26f5 AUTOGEN: Documentation update: cmake-qt, AUTOMOC, AUTOUIC, AUTORCC 2017-01-11 09:25:48 -05:00
Daniel Pfeifer
d6877e6c40 Don't include CMakeParseArguments
The cmake_parse_arguments command is builtin with version 3.5.
The CMakeParseArguments module is empty and exists for backwards
compatibility with CMake 3.4 and lower.

Remove the includes of CMakeParseArguments from CMake's modules.
The modules are always used with the current version of CMake.

Leave the includes in the tests, as the tests may be run with an older
version of CMake.
2017-01-11 13:14:57 +01:00
Konstantin Podsvirov
0315ab7a31 Add installation infix (empty by default) 2017-01-11 14:10:39 +03:00
Konstantin Podsvirov
6310f7c3a0 Add cpack_ifw_configure_file command 2017-01-11 13:56:45 +03:00
Kitware Robot
3e5fbbd6cd CMake Nightly Date Stamp 2017-01-11 00:01:06 -05:00
Alex Turbov
ff91b1514b FindBoost: Search official location of prebuilt binaries on Windows
Make it possible to find Boost in the default install path (`c:\boost`)
of an official prebuilt binaries installation even when `BOOST_ROOT`
has not been specified.
2017-01-10 14:21:53 -05:00
Florent Castelli
524f5ee186 Android: Set compiler target platform when compiling ASM with Clang
Closes: #16535
2017-01-10 14:12:46 -05:00
Harry Mallon
696339a9d5 FindOpenSSL: Check that both CRYPTO and SSL libraries are present
* Strawberry perl on Windows installs one that is found by the
  default finder

While at it, de-duplicate code setting `OPENSSL_LIBRARIES`.
2017-01-10 13:42:48 -05:00
Dong XiaoC
8deb913d98 FindGTest: add lib search path for MSVC x64 platform 2017-01-10 13:26:33 -05:00