summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* QtIFW: Improved packagingKonstantin Podsvirov2017-01-129-77/+65
| | | | | | | | | | | | Now cpack_ifw_configure_file command used to configure template files of component's scripts. Now for these template files we can use QtIFW predefined variables (like @VAR@) and template variables in Qt/IFW/SDK/Creator templates style (like %VAR%). Now CMake_INSTALL_INFIX advanced variable used to configure CMake installation destination when package as part of QtSDK.
* Merge topic 'cuda-windows'Brad King2017-01-1229-46/+266
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * CUDA: Enable CudaOnly.SeparateCompilation test runtime callsBrad King2017-01-121-4/+4
| | | | | | | | Uncomment the calls in `main.cpp` (and fix the signatures).
| * CUDA: Port test cases to Windows with MSVC host compilerBrad King2017-01-1211-13/+89
| |
| * CUDA: Populate NVIDIA compiler information on WindowsBrad King2017-01-122-13/+59
| | | | | | | | | | | | | | 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.
| * CUDA: Detect implicit link information on WindowsBrad King2017-01-123-1/+15
| | | | | | | | | | The `nvcc -v` output on Windows uses response files, so load the one we need to extract the full link line.
| * CUDA: Find MSVC binutils on WindowsBrad King2017-01-122-3/+8
| | | | | | | | | | 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.
| * CUDA: Populate compiler PDB placeholder during device linkingBrad King2017-01-123-0/+15
| | | | | | | | | | The device link step runs the host compiler internally so we need to use the proper compiler PDB file with MSVC.
| * CUDA: Use `.obj` object file extension on WindowsBrad King2017-01-124-5/+15
| |
| * CUDA: Detect MSVC architecture idBrad King2017-01-124-1/+9
| |
| * CUDA: Detect use of MSVC host compilerBrad King2017-01-123-1/+22
| | | | | | | | Report it in `CMAKE_CUDA_SIMULATE_{ID,VERSION}`.
| * CUDA: Allow platform files to set device linking rulesBrad King2017-01-121-5/+8
| | | | | | | | | | Condition the default settings on the rule variables not already being set.
| * CMakeParseImplicitLinkInfo: Add support for MSVC invoked by CUDA nvccBrad King2017-01-122-0/+22
| |
* | Merge branch 'release'Brad King2017-01-120-0/+0
|\ \
| * \ Merge branch 'cmFileMonitor-skip-empty-names' into releaseBrad King2017-01-111-0/+3
| |\ \
* | \ \ Merge topic 'launcher-tests'Brad King2017-01-1210-35/+88
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4b0c13a8 Tests: Add additional launcher tests
| * | | | Tests: Add additional launcher testsMatthew Woehlke2017-01-1010-35/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modify the launcher test to also try to build two executables, having respectively build and link errors. This is intended to test that launchers are used when running compile and link commands, as well as custom commands. (In particular, this should catch breakage such as that fixed by ce71bd9505a.)
* | | | | Merge topic 'asan_overriding_user_options'Brad King2017-01-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | efff7086 ctest_memcheck: Append sanitizers user options at the end to allow overriding
| * | | | | ctest_memcheck: Append sanitizers user options at the end to allow overridingSylvain Joubert2017-01-111-1/+1
| | | | | |
* | | | | | Merge topic 'InstallRequiredSystemLibraries-UCRT-configs'Brad King2017-01-121-8/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | e0ed1de4 InstallRequiredSystemLibraries: Distinguish UCRT install configurations
| * | | | | | InstallRequiredSystemLibraries: Distinguish UCRT install configurationsBjoern Thiel2017-01-111-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the `CMAKE_INSTALL_UCRT_LIBRARIES` feature to honor the `CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY` and `CMAKE_INSTALL_DEBUG_LIBRARIES` settings. Closes: #16542
* | | | | | | Merge topic 'get_prerequisites_delayload'Brad King2017-01-121-0/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a7c5d5fb GetPrerequisites: Exclude delay load dependencies on Windows
| * | | | | | | GetPrerequisites: Exclude delay load dependencies on WindowsPascal Thomet2017-01-111-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge topic 'fix_get_prerequisites'Brad King2017-01-121-0/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | 17a0703d GetPrerequisites: Do not fail on files we cannot find
| * | | | | | | GetPrerequisites: Do not fail on files we cannot findMartin Koegler2017-01-111-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | Merge topic 'cuda_compile_features_test_use_widely_supported_feature'Brad King2017-01-121-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1ce39a1e CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler support
| * | | | | | | | CUDA: ConsumeCompileFeatures use cxx_nullptr for wider compiler supportRobert Maynard2017-01-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to use a C++11 feature that is supported by the widest range of compilers, so we chose nullptr instead of constexpr.
* | | | | | | | | Merge topic 'FindJava-jre-hints'Brad King2017-01-121-0/+8
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb728d26 FindJava: add hints for jre
| * | | | | | | | | FindJava: add hints for jreRechi Rechi2017-01-111-0/+8
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge topic 'vs15-detect-from-installer'Brad King2017-01-129-44/+1604
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | | VS: Port Visual Studio Setup third-party header to older VS versionsBrad King2017-01-111-0/+13
| | | | | | | | | |
| * | | | | | | | | VS: Use Visual Studio Installer to locate VS 2017Iyyappa Murugandi2016-12-164-38/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 and later may no longer populate the Windows Registry entries CMake has traditionally used to find the VS installations. This is because VS now supports having multiple installations of the same version. The Visual Studio Installer tool provides a COM interface we can query to locate installations.
| * | | | | | | | | VS: Add helper class to interact with Visual Studio InstallerIyyappa Murugandi2016-12-163-0/+551
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 exports a COM component which can be queried to find if VS 2017 is installed and also other components such as VC toolset and Windows SDKs. Add a helper class to interact with this interface.
| * | | | | | | | | VS: Fix VS 2017 Windows Store toolset selectionIyyappa Murugandi2016-12-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 2017 uses the `v141` toolset, not `v140`.
| * | | | | | | | | VS: Drop check for VS 15 Express EditionIyyappa Murugandi2016-12-161-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no such version of VS 2017.
| * | | | | | | | | VS: Port Visual Studio Setup third-party header to MinGWIyyappa Murugandi2016-12-161-0/+493
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `Setup.Configuration.h` which is released by Microsoft is specific to MSVC. Update it to compile with non-MS toolchains like MinGW.
| * | | | | | | | | VS: Add Visual Studio Setup third-party headerIyyappa Murugandi2016-12-162-0/+486
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Visual Studio Setup team releases a `Setup.Configuration.h` header under the MIT License for use by external applications to interact with the Visual Studio Installer tool [1]. Import it into our source tree for use by CMake. [1] https://github.com/microsoft/vs-setup-samples
* | | | | | | | | | Merge topic 'cmListFileLexer-warning-fix'Brad King2017-01-123-3/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6e6253ea cmListFileLexer: Fix signature of cmListFileLexer_New
| * | | | | | | | | | cmListFileLexer: Fix signature of cmListFileLexer_NewBrad King2017-01-113-3/+3
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add explicit `(void)` instead of an empty argument list, as suggested by `-Wstrict-prototypes`.
* | | | | | | | | | Merge topic 'dont-include-CMakeParseArguments'Brad King2017-01-1219-39/+0
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6877e6c Don't include CMakeParseArguments
| * | | | | | | | | | Don't include CMakeParseArgumentsDaniel Pfeifer2017-01-1119-39/+0
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | Merge topic 'cmake-install-infix'Brad King2017-01-121-1/+7
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0315ab7a Add installation infix (empty by default)
| * | | | | | | | | | Add installation infix (empty by default)Konstantin Podsvirov2017-01-111-1/+7
| | |_|_|/ / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'add-cpack-ifw-configure-file'Brad King2017-01-124-0/+76
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6310f7c3 Add cpack_ifw_configure_file command
| * | | | | | | | | | Add cpack_ifw_configure_file commandKonstantin Podsvirov2017-01-114-0/+76
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'codeblocks-nmake-makefiles-jom'Brad King2017-01-123-1/+10
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3462118c Allow CodeBlocks for NMake Makefiles JOM
| * | | | | | | | | | Allow CodeBlocks for NMake Makefiles JOMKonstantin Podsvirov2017-01-103-1/+10
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'cmFileMonitor-skip-empty-names'Brad King2017-01-121-0/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | 7bad99b0 cmake-server: Do not try watching subdirectories with empty names
| * | | | | | | | | cmake-server: Do not try watching subdirectories with empty namesAleix Pol2017-01-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `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
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-01-121-1/+1
| |_|_|_|_|_|/ / / |/| | | | | | | |
View Lorry Controller Status