summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'xml-level'Brad King2018-04-062-14/+18
|\ | | | | | | | | | | | | 050ddfb3f3 cmXMLWriter: code improvement Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1925
| * cmXMLWriter: code improvementVitaly Stakhovsky2018-04-032-14/+18
| | | | | | | | New Indent member will be used for XML indentation
* | Merge topic 'glob_configure_depends'Brad King2018-04-0638-56/+793
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c4f8b4596 Adjust help documentation for file(GLOB), add topic notes 20612978c8 Add tests for `file(GLOB)` CONFIGURE_DEPENDS flag 3f4b81f540 Add glob verify support to XCode, VS, Ninja, and Makefile generators ca0befc2e1 Add `CONFIGURE_DEPENDS` flag support to cmFileCommand::HandleGlobCommand 599c93e22d Add cmGlobVerificationManager class, integrate with cmake and cmState Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1767
| * | Adjust help documentation for file(GLOB), add topic notesShane Parris2018-04-022-2/+17
| | |
| * | Add tests for `file(GLOB)` CONFIGURE_DEPENDS flagShane Parris2018-04-0219-0/+159
| | |
| * | Add glob verify support to XCode, VS, Ninja, and Makefile generatorsShane Parris2018-04-029-54/+227
| | |
| * | Add `CONFIGURE_DEPENDS` flag support to cmFileCommand::HandleGlobCommandShane Parris2018-03-291-0/+38
| | |
| * | Add cmGlobVerificationManager class, integrate with cmake and cmStateShane Parris2018-03-298-0/+352
| | |
* | | CMake Nightly Date StampKitware Robot2018-04-061-1/+1
| | |
* | | Merge topic 'findwxwidgets-msys-library-dirs'Brad King2018-04-051-0/+20
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 44ad8e48de FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYS Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1930
| * | | FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYSARATA Mizuki2018-04-041-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for `wxWidgets_LIBRARIES` variable, introduced by e8b77084, fails with the `wx-config` script generated by an MSYS build, because `wxWidgets_LIBRARY_DIRS` is in POSIX style. This commit fixes the problem with `wxWidgets_LIBRARY_DIRS` by converting it to Windows style. The actual code were copied from bf643286, which does the same thing for `wxWidgets_INCLUDE_DIRS`.
* | | | Merge topic 'vs10-groups'Brad King2018-04-052-79/+102
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 30bbb4f2ac cmVisualStudio10TargetGenerator: extend DOM-like generation Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1905
| * | | | cmVisualStudio10TargetGenerator: extend DOM-like generationVitaly Stakhovsky2018-03-312-79/+102
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The local Elem class is extended with more XML-generating functions. WriteGroups() is rewritten to use these new functions, avoiding BuildFileStream.
* | | | | Merge topic 'msvc-toolset-version-variable'Brad King2018-04-0510-135/+103
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45bf6f6246 Modules: Use MSVC_TOOLSET_VERSION variable to simplify logic 304f493e57 MSVC: Add MSVC_TOOLSET_VERSION variable Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1882
| * | | | | Modules: Use MSVC_TOOLSET_VERSION variable to simplify logicArkady Shapkin2018-04-045-134/+48
| | | | | |
| * | | | | MSVC: Add MSVC_TOOLSET_VERSION variableArkady Shapkin2018-04-045-1/+55
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Provide the MSVC toolset version number based on the compiler version. Fixes: #16923
* | | | | Merge branch 'release-3.11'Brad King2018-04-050-0/+0
|\ \ \ \ \
| * \ \ \ \ Merge branch 'revert-CheckIncludeFile-required-libs' into release-3.11Brad King2018-04-044-18/+16
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Merge-request: !1931
* | \ \ \ \ \ Merge topic 'revert-CheckIncludeFile-required-libs'Brad King2018-04-054-18/+16
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 35109e718b Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES" Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !1931
| * | | | | | Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES"Brad King2018-04-044-18/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit v3.11.0-rc1~108^2 (CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES, 2017-12-24). The behavior change can affect checks in existing projects that don't expect the behavior. Introducing the behavior again will require a policy. Fixes: #17874 Issue: #9514
* | | | | | | CMake Nightly Date StampKitware Robot2018-04-051-1/+1
| |_|_|_|/ / |/| | | | |
* | | | | | 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.
generated by cgit v0.12 at 2025-02-05 12:50:47 (GMT)