summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'release-3.11'Brad King2018-04-040-0/+0
|\
| * Merge branch 'autogen-protect-cmsys-calls' into release-3.11Brad King2018-04-045-48/+163
| |\ | | | | | | | | | Merge-request: !1918
* | \ Merge topic 'autogen-protect-cmsys-calls'Brad King2018-04-045-48/+163
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b11e2c80b1 Autogen: Print moc/uic/rcc output to stdout 1d2c9d8c6d Autogen: Use std::istreambuf_iterator for file so string reading ccc38fa509 Autogen: Protected calls to cmFilePathChecksum 719b24c872 Autogen: Protected calls to cmQtAutoGen::SubDirPrefix 9a73615815 Autogen: Protected calls to cmSystemTools::GetFilenameWithoutLastExtension 65203ce407 Autogen: Protected calls to cmSystemTools::Split/JoinPath 14a86c9ea7 Autogen: Protected calls to cmSystemTools::CollapseCombinedPath Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1918
| * | Autogen: Print moc/uic/rcc output to stdoutSebastian Holtermann2018-04-032-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | The output of moc/uic/rcc used to be discarded unless the program failed. This lets moc/uic/rcc print their output to stdout even on success. Closes #17860
| * | Autogen: Use std::istreambuf_iterator for file so string readingSebastian Holtermann2018-04-032-20/+34
| | | | | | | | | | | | | | | | | | | | | This adds a dedicated mutex for file reading and writing to cmQtAutoGenerator::FileSystem. The purpose of the change is to avoid that long files reads block cmsys based path computations, which are protected by an other mutex.
| * | Autogen: Protected calls to cmFilePathChecksumSebastian Holtermann2018-04-034-4/+27
| | | | | | | | | | | | | | | Closes #17861 Closes #17862
| * | Autogen: Protected calls to cmQtAutoGen::SubDirPrefixSebastian Holtermann2018-04-033-5/+14
| | |
| * | Autogen: Protected calls to cmSystemTools::GetFilenameWithoutLastExtensionSebastian Holtermann2018-04-033-5/+14
| | |
| * | Autogen: Protected calls to cmSystemTools::Split/JoinPathSebastian Holtermann2018-04-033-2/+33
| | |
| * | Autogen: Protected calls to cmSystemTools::CollapseCombinedPathSebastian Holtermann2018-04-033-7/+24
| |/
* | Merge topic 'wcdh-bare-features'Brad King2018-04-045-34/+127
|\ \ | | | | | | | | | | | | | | | | | | f38d050231 WCDH: introduce BARE_FEATURES Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1869
| * | WCDH: introduce BARE_FEATURESRolf Eike Beer2018-04-035-34/+127
| | | | | | | | | | | | | | | | | | This allows defining compat versions of some C/C++ features with the name of the keyword itself, so all code can look as if it was written for the new language standard.
* | | Merge topic 'android-no-libstdc++'Brad King2018-04-0411-0/+45
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 843d55de29 Android: Suppress implicit -lstdc++ linker flag Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1919
| * | | Android: Suppress implicit -lstdc++ linker flagBrad King2018-04-0311-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The chosen STL libraries are already linked explicitly so we shouldn't let the compiler add its implicit `-lstdc++` (the default) when invoking the linker. Fixes: #17863 NDK-Issue: https://github.com/android-ndk/ndk/issues/105 Inspired-by: Tom Hughes <tomtheengineer@gmail.com>
* | | | Merge topic 'typo-in-release-script'Brad King2018-04-043-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 52b1419040 Utilities/Release: Remove extra colon from release scripts Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1914
| * | | | Utilities/Release: Remove extra colon from release scriptsJean-Christophe Fillion-Robin2018-04-033-3/+3
| | | | | | | | | | | | | | | | | | | | The type of the `BUILD_QtDialog` cache entry is `BOOL`, not `BOOL:`.
* | | | | Merge topic 'cuda_support_system_libraries_with_device_symbols'Brad King2018-04-047-35/+151
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 41eab150a8 CUDA: Pass more link libraries to device linking 88c7abb740 CUDA: Pass host linker directories to device linker Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1634
| * | | | | CUDA: Pass more link libraries to device linkingRobert Maynard2018-03-285-31/+118
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we dropped non-target items from the device link line because nvcc rejects paths to shared library files, and only with target items do we know the kind of library. However, this also prevents projects from linking to system-provided libraries like `cublas_device` that contain device code. Fix this by passing more link items to device linking. Items that are not file paths, such as `-lfoo`, can simply be passed unconditionally. Items that are targets known to be shared libraries can still be skipped. Items that are paths to library files can be passed directly if they end in `.a`. Otherwise, pass them using `-Xnvlink` to bypass nvcc's front-end. The nvlink tool knows to ignore shared library files. Issue: #16317
| * | | | | CUDA: Pass host linker directories to device linkerBrad King2018-03-282-4/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some environments, libraries containing device code are installed in directories searched by the host linker but not passed by nvcc to nvlink. Make these libraries available by explicitly passing the host linker search directories during device linking. Issue: #16317
* | | | | | Merge topic 'FindPython-stabilization'Brad King2018-04-042-7/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1fd2bbe75 FindPython: enhance multiple major versions lookup Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1915
| * | | | | | FindPython: enhance multiple major versions lookupMarc Chevrier2018-04-032-7/+17
| | | | | | |
* | | | | | | Merge topic 'UseSWIG-add-new-behavior'Craig Scott2018-04-0430-166/+435
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8ab4e38373 UseSWIG: Add new behavior for better support files management 438429d6fe UseSWIG: Rework tests Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1891
| * | | | | | | UseSWIG: Add new behavior for better support files managementMarc Chevrier2018-04-036-43/+245
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes: #17840
| * | | | | | | UseSWIG: Rework testsMarc Chevrier2018-04-0226-105/+172
| | |_|/ / / / | |/| | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-041-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | Merge topic 'FPHSA-include'Brad King2018-04-033-3/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d6883801cd Find*: always include FPHSA shipped with CMake Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1910
| * | | | | | Find*: always include FPHSA shipped with CMakeRolf Eike Beer2018-04-023-3/+3
| | | | | | |
* | | | | | | Merge topic 'FindDCMTK-includes'Brad King2018-04-031-8/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5c948aa50d FindDCMTK: use CheckIncludeFiles instead of open coding it Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1911
| * | | | | | | FindDCMTK: use CheckIncludeFiles instead of open coding itRolf Eike Beer2018-04-021-8/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | While at it remove a needless status message.
* | | | | | | Merge topic 'android-clang-std-flags'Brad King2018-04-031-2/+9
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 12e6796b62 Android: Do not pass non-existent Clang -std flags Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1913
| * | | | | | Android: Do not pass non-existent Clang -std flagsBrad King2018-04-021-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android NDK r16b comes with Android clang version 5.0.300080 (based on LLVM 5.0.300080) Although it claims version 5, it does not support the `-std=c++17` or `-std=c++2a` flags that upstream Clang does. Android NDK r17-beta1 comes with Android (4639204 based on r316199) clang version 6.0.1 that does have the flags.
* | | | | | | Merge topic 'fortran-fpp'Brad King2018-04-031-1/+1
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 445d6781e6 Fortran: Add support for .fpp extensions Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1912
| * | | | | | Fortran: Add support for .fpp extensionsBrad King2018-04-021-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compilers such as `gfortran` recognize `.fpp` extensions to mean a Fortran source on which the preprocessor should run. Fixes: #17869
* | | | | | CMake Nightly Date StampKitware Robot2018-04-031-1/+1
|/ / / / /
* | | | | Merge topic 'remove-vs8-generator'Brad King2018-04-0230-231/+33
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | eb80af9093 Drop Visual Studio 8 2005 generator e7af91d026 Tests: Remove unused file from Tutorial Step7 test Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1901
| * | | | | Drop Visual Studio 8 2005 generatorBrad King2018-04-0229-222/+33
| | | | | | | | | | | | | | | | | | | | | | | | This generator has been deprecated since CMake 3.9. Remove it.
| * | | | | Tests: Remove unused file from Tutorial Step7 testBrad King2018-03-291-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `build2.cmake` script looks like it was accidentally committed after being created for local testing.
* | | | | | Merge topic 'variable-CMAKE_FOLDER'Brad King2018-04-025-0/+17
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df535ad846 Add CMAKE_FOLDER variable to initialize FOLDER target property Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1896
| * | | | | | Add CMAKE_FOLDER variable to initialize FOLDER target propertyMarc B2018-03-295-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be used for example to organize all following targets into one Visual Studio folder: set(CMAKE_FOLDER Libraries) add_subdirectory(libA) add_subdirectory(libB) set(CMAKE_FOLDER Executables) add_subdirectory(progA) Another possibility is using the current directory name for all following targets in subdirectories: get_filename_component(dirname "${CMAKE_CURRENT_SOURCE_DIR}" NAME) string(APPEND CMAKE_FOLDER "/${dirname}")
* | | | | | | Merge topic 'FindCUDA-nvcc-executable-env'Brad King2018-04-021-10/+14
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23119366e9 FindCUDA: Make nvcc configurable via CUDA_NVCC_EXECUTABLE env var Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1899
| * | | | | | | FindCUDA: Make nvcc configurable via CUDA_NVCC_EXECUTABLE env varEdward Z. Yang2018-03-291-10/+14
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful if, for example, you want ccache to be used for nvcc. With the current behavior, cmake always picks up /usr/local/cuda/bin/nvcc, even if there is a ccache nvcc stub in the PATH. Allowing for CUDA_NVCC_EXECUTABLE lets us work around the problem. Signed-off-by: Edward Z. Yang <ezyang@fb.com>
* | | | | | | Merge topic 'update-kwsys'Brad King2018-04-023-19/+25
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c90e94368 Merge branch 'upstream-KWSys' into update-kwsys b66f18c84f KWSys 2018-03-29 (488f2031) Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1902
| * | | | | | Merge branch 'upstream-KWSys' into update-kwsysBrad King2018-03-293-19/+25
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * upstream-KWSys: KWSys 2018-03-29 (488f2031)
| | * | | | | | KWSys 2018-03-29 (488f2031)KWSys Upstream2018-03-293-19/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Code extracted from: https://gitlab.kitware.com/utils/kwsys.git at commit 488f203157792badb6204be513602d4e83884d21 (master). Upstream Shortlog ----------------- Ben Boeckel (1): a3caaeec SystemTools: faster relative path codepath Brad King (1): 805d9a7c Terminal: Add xterm-kitty to VT100 color support whitelist luz.paz (1): 94484960 Source typo fix s/[Pp]athes/[Pp]aths/
* | | | | | | | Merge topic 'features-c++20'Brad King2018-04-0218-18/+91
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8570dc7f64 Help: Update compiler versions in cmake-compile-features.7.rst 874d3d2948 Help: Add release note for C++ 20 support 7f295b1bd3 Features: Activate C++ 20 support for Clang 5.0+ 71cb8ce3a1 Features: Activate C++ 20 support for GNU 8.0+ 8f146c4508 Features: Activate C++ 20 support for MSVC 19.12.25835+ 7fe580a362 Features: Add infrastructure for C++ 20 language standard 1b328e09a3 Features: Use -std=c++17 for C++ 17 on Clang 5.0+ 0bc3e5788a Features: Use -std=c++17 for C++ 17 on GNU 8.0+ Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1892
| * | | | | | | | Help: Update compiler versions in cmake-compile-features.7.rstBrad King2018-03-271-5/+5
| | | | | | | | |
| * | | | | | | | Help: Add release note for C++ 20 supportBrad King2018-03-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes: #17849
| * | | | | | | | Features: Activate C++ 20 support for Clang 5.0+Brad King2018-03-271-0/+5
| | | | | | | | |
| * | | | | | | | Features: Activate C++ 20 support for GNU 8.0+Brad King2018-03-271-0/+5
| | | | | | | | |
| * | | | | | | | Features: Activate C++ 20 support for MSVC 19.12.25835+Brad King2018-03-271-0/+4
| | | | | | | | |
generated by cgit v0.12 at 2025-01-19 18:35:33 (GMT)