summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Makefiles: Make fast local and strip install truly fastMike Gelfand2017-01-131-2/+2
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using a Makefiles generator, `install/local/fast` and `install/strip/fast` targets are not at all fast. They depend on `install/local` and `install/strip` targets respectively instead of `preinstall/fast` and don't contain any commands instead of repeating commands in `install/local` and `install/strip`. The issue was introduced by simple typos in commits v2.6.0~2825 (Adding install/local global target for Makefile generators, 2006-08-29) and v2.6.0~1743 (add install/strip target for makefile generators, 2007-05-18).
* | | | | | | | | Merge topic 'cuda-no-def-file-for-device'Brad King2017-01-162-10/+0
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 05dbc940 CUDA: Don't use module definition `.def` files for device linking
| * | | | | | | | | CUDA: Don't use module definition `.def` files for device linkingRobert Maynard2017-01-122-10/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | These files are meaningful only to the host linker.
* | | | | | | | | Merge topic 'cuda_propagate_flags_when_dlink_on_executables'Brad King2017-01-1613-3/+75
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8d1f9e5b CUDA: Now pass correct FLAGS when device link cuda executables. dc5051f1 CUDA: Test that CUDA flags are used when device linking executables.
| * | | | | | | | | CUDA: Now pass correct FLAGS when device link cuda executables.Robert Maynard2017-01-128-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we had a two issues when building cuda executables that required separable compilation. The first was that we didn't propagate FLAGS causing any -arch / -gencode flags to be dropped, and secondly generators such as ninja would use the CXX language flags instead of CUDA when the executable was mixed language.
| * | | | | | | | | CUDA: Test that CUDA flags are used when device linking executables.Robert Maynard2017-01-125-0/+48
| |/ / / / / / / /
* | | | | | | | | Merge topic 'ninja-no-static-lib-def-file'Brad King2017-01-161-0/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 47ffa0ea Ninja: Do not use module definition `.def` files for static libraries
| * | | | | | | | | Ninja: Do not use module definition `.def` files for static librariesBrad King2017-01-121-0/+7
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A module definition (`.def`) file specifies symbols to export from a linked binary. The librarian tool is not a linker and so should not be given a `/DEF:...` flag with the `.def` file. The other generators already do not do this, so fix Ninja to be consistent. Closes: #16537
* | | | | | | | | Merge topic 'vs15-detect-from-installer'Brad King2017-01-161-36/+7
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0362c60f cmVSSetupHelper: Simplify use of EnumerateAndChooseVSInstance 577f721f VS: Fix detection of VS 2017 installation with WindowsStore
| * | | | | | | | | cmVSSetupHelper: Simplify use of EnumerateAndChooseVSInstanceBrad King2017-01-121-38/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method short-circuits when an instance has already been chosen, so avoid duplicating this check at call sites.
| * | | | | | | | | VS: Fix detection of VS 2017 installation with WindowsStoreBrad King2017-01-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix logic in cmVSSetupAPIHelper::IsVS2017Installed to work correctly on repeat calls. Closes: #16549
* | | | | | | | | | Merge topic 'usage-cpack-ifw-configure-file'Brad King2017-01-169-77/+65
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 49717993 QtIFW: Improved packaging
| * | | | | | | | | | 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 'clang-3.1-3.3-cpp11'Brad King2017-01-162-5/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9fe399e3 Features: activate C++11 support for Clang 3.1+
| * | | | | | | | | | Features: activate C++11 support for Clang 3.1+Giel van Schijndel2017-01-122-5/+4
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'fix_repeat_until_fail_duplicated_output'Brad King2017-01-162-0/+4
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1058637 CTest: Properly reset output to avoid duplication with --repeat-until-fail
| * | | | | | | | | | CTest: Properly reset output to avoid duplication with --repeat-until-failSylvain Joubert2017-01-122-0/+4
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'sparc-libatomic'Brad King2017-01-161-0/+9
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cda9a904 Explicitly link against libatomic on Linux/sparc for `__atomic_fetch_add_4`
| * | | | | | | | | | | Explicitly link against libatomic on Linux/sparc for `__atomic_fetch_add_4`Rolf Eike Beer2017-01-091-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On this platform atomic instructions are implemented using `libatomic` so we need to link it to use them.
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-01-161-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-01-151-1/+1
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
* | | | | | | | | | | CMake Nightly Date StampKitware Robot2017-01-141-1/+1
| |_|_|_|_|_|_|/ / / |/| | | | | | | | |
* | | | | | | | | | Merge topic 'docs-function-exists'Brad King2017-01-131-9/+21
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ae2dcb1 CheckFunctionExists: Document suggestion to use CheckSymbolExists instead.
| * | | | | | | | | | CheckFunctionExists: Document suggestion to use CheckSymbolExists instead.Stephen Sorley2017-01-121-9/+21
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CheckFunctionExists has some severe limitations that are overcome by CheckSymbolExists. Document them and suggest the alternative.
* | | | | | | | | | Merge branch 'release'Brad King2017-01-130-0/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | CMake 3.7.2v3.7.2Brad King2017-01-131-1/+1
| | | | | | | | | |
* | | | | | | | | | CMake Nightly Date StampKitware Robot2017-01-131-1/+1
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | 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