mirrors/cmake
2
0 Fork 0
mirror of https://gitlab.kitware.com/cmake/cmake.git synced 2026-10-12 23:43:59 +03:00
Code Activity
47,352 Commits 2 Branches 415 Tags
94de927cab19609aeeff032c64f16cfd257fca2f
Commit Graph
47352 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
jrp2014 1519628e60 cmVisualStudio10TargetGenerator: Make NsightTegraVersion unsigned 
It's used in unsigned contexts, such as with format strings.
 2018-04-05 13:42:49 -04:00
jrp2014 2f87d00803 cmMacroCommand: Fix format string to match type of argument 2018-04-05 13:42:49 -04:00
jrp2014 b0676cc5d4 Add in-class initialization of some members 
Several class constructors leave members uninitialized.  The members are
initialized before use in methods, but it is clearer and less
error-prone to initialize them at their definition site.
 2018-04-05 13:42:48 -04:00
jrp2014 966dba5b68 cmAlgorithms: Remove unnecessary typename keyword 2018-04-05 13:42:48 -04:00
jrp2014 12a145534a gitignore: Ignore a .vs directory in the source tree 2018-04-05 13:42:42 -04:00
Brad King d7af8a34b6 Merge topic 'findwxwidgets-msys-library-dirs' 
44ad8e48de FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1930
 2018-04-05 13:28:19 -04:00
Brad King 57c2834da0 Merge topic 'vs10-groups' 
30bbb4f2ac cmVisualStudio10TargetGenerator: extend DOM-like generation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1905
 2018-04-05 13:27:39 -04:00
Brad King 308d21b225 Merge topic 'msvc-toolset-version-variable' 
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
 2018-04-05 13:26:49 -04:00
Brad King 43e44bcd8e Merge branch 'release-3.11' 2018-04-05 13:24:02 -04:00
Brad King d1660bd2cb Merge topic 'revert-CheckIncludeFile-required-libs' 
35109e718b Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES"

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1931
 2018-04-05 13:23:34 -04:00
Brad King d6390ce26e Ninja: Fix Fortran support with response files 
The Ninja generator splits preprocessing and compilation steps for
Fortran.  Fix this logic to work when using response files for
compilation so that it works for the preprocessing step too.

This fixes behavior under `CMAKE_NINJA_FORCE_RESPONSE_FILE`.

Issue: #17877
 2018-04-05 13:02:27 -04:00
Brad King 8592c6326b cmNinjaTargetGenerator: Move force-rspfile check to earlier 2018-04-05 12:51:21 -04:00
Brad King e0aa060352 cmNinjaTargetGenerator: Move depfile logic to later in its function 
Clarify that other compile rule generation logic does not depend on it.
 2018-04-05 12:50:57 -04:00
Marc Chevrier 38dcdd7641 UseSWIG: Ensure tests are usable in multi-config mode. 
Fixes: #17875
 2018-04-05 12:09:53 +02:00
Michael Stürmer 4b7a82b4ed cmVisualStudio10TargetGenerator: set /clr compiler flag from property 2018-04-05 06:36:53 +02:00
Michael Stürmer 20e31fb4c9 cmExportFileGenerator: add target property for managed targets 2018-04-05 06:36:52 +02:00
Michael Stürmer 411a22706a cmGeneratorTarget: add handling of managed assemblies to HasImportLibrary() 2018-04-05 06:36:51 +02:00
Michael Stürmer fb433ff283 cmGeneratorTarget: Make import library checks config-aware 2018-04-05 06:36:49 +02:00
Michael Stürmer 4c1f33961f cmGeneratorTarget: add GetManagedType() and CheckManagedType() methods 2018-04-05 06:36:48 +02:00
Michael Stürmer 6c517a9f8d cmGeneratorTarget: add HasLanguage() as wrapper for GetLanguages() 2018-04-05 06:35:01 +02:00
Kitware Robot aae2bcf8dd CMake Nightly Date Stamp 2018-04-05 00:01:04 -04:00
jrp2014 0ad329f7c0 Sanitize paths from LINK_DIRECTORIES directory property 
Normally they are sanitized by the `link_directories` command before
populating the property, but projects may set the property directly.
 2018-04-04 14:42:20 -04:00
Arkady Shapkin 45bf6f6246 Modules: Use MSVC_TOOLSET_VERSION variable to simplify logic 2018-04-04 13:21:16 -04:00
Arkady Shapkin 304f493e57 MSVC: Add MSVC_TOOLSET_VERSION variable 
Provide the MSVC toolset version number based on the compiler version.

Fixes: #16923
 2018-04-04 13:21:09 -04:00
Brad King 1c85742701 Merge branch 'revert-CheckIncludeFile-required-libs' into release-3.11 
Merge-request: !1931
 2018-04-04 13:17:30 -04:00
Brad King 35109e718b Revert "CheckIncludeFiles: Honor CMAKE_REQUIRED_LIBRARIES" 
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
 2018-04-04 13:14:01 -04:00
ARATA Mizuki 44ad8e48de FindwxWidgets: Fix wxWidgets_LIBRARY_DIRS on Cygwin/MSYS 
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`.
 2018-04-05 01:37:57 +09:00
Brad King 3201e4c156 Merge branch 'release-3.11' 2018-04-04 11:22:23 -04:00
Brad King 49ea1bb243 Merge topic 'autogen-protect-cmsys-calls' 
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
 2018-04-04 11:21:54 -04:00
Brad King b1aa90f057 Merge branch 'autogen-protect-cmsys-calls' into release-3.11 
Merge-request: !1918
 2018-04-04 11:20:53 -04:00
Brad King 6425ceb46c Merge topic 'wcdh-bare-features' 
f38d050231 WCDH: introduce BARE_FEATURES

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1869
 2018-04-04 11:16:50 -04:00
Brad King 8496d11ef8 Merge topic 'android-no-libstdc++' 
843d55de29 Android: Suppress implicit -lstdc++ linker flag

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1919
 2018-04-04 11:14:36 -04:00
Brad King 1f72f409ee Merge topic 'typo-in-release-script' 
52b1419040 Utilities/Release: Remove extra colon from release scripts

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1914
 2018-04-04 11:13:38 -04:00
Brad King 640bc9def4 Merge topic 'cuda_support_system_libraries_with_device_symbols' 
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
 2018-04-04 11:12:52 -04:00
Brad King 124472e9fc Merge topic 'FindPython-stabilization' 
b1fd2bbe75 FindPython: enhance multiple major versions lookup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1915
 2018-04-04 11:06:02 -04:00
Craig Scott 74005a136c Merge topic 'UseSWIG-add-new-behavior' 
8ab4e38373 UseSWIG: Add new behavior for better support files management
438429d6fe UseSWIG: Rework tests

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1891
 2018-04-04 10:24:07 -04:00
Kitware Robot c468b9a231 CMake Nightly Date Stamp 2018-04-04 00:01:03 -04:00
Vitaly Stakhovsky 050ddfb3f3 cmXMLWriter: code improvement 
New Indent member will be used for XML indentation
 2018-04-03 17:28:08 -04:00
Rolf Eike Beer f38d050231 WCDH: introduce BARE_FEATURES 
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.
 2018-04-03 20:56:28 +02:00
Brad King 843d55de29 Android: Suppress implicit -lstdc++ linker flag 
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>
 2018-04-03 14:34:57 -04:00
Jean-Christophe Fillion-Robin 52b1419040 Utilities/Release: Remove extra colon from release scripts 
The type of the `BUILD_QtDialog` cache entry is `BOOL`, not `BOOL:`.
 2018-04-03 14:11:38 -04:00
Sebastian Holtermann b11e2c80b1 Autogen: Print moc/uic/rcc output to stdout 
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
 2018-04-03 17:20:30 +02:00
Sebastian Holtermann 1d2c9d8c6d Autogen: Use std::istreambuf_iterator for file so string reading 
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.
 2018-04-03 17:20:30 +02:00
Sebastian Holtermann ccc38fa509 Autogen: Protected calls to cmFilePathChecksum 
Closes #17861
Closes #17862
 2018-04-03 17:20:30 +02:00
Sebastian Holtermann 719b24c872 Autogen: Protected calls to cmQtAutoGen::SubDirPrefix 2018-04-03 17:20:30 +02:00
Sebastian Holtermann 9a73615815 Autogen: Protected calls to cmSystemTools::GetFilenameWithoutLastExtension 2018-04-03 17:20:30 +02:00
Sebastian Holtermann 65203ce407 Autogen: Protected calls to cmSystemTools::Split/JoinPath 2018-04-03 17:20:30 +02:00
Sebastian Holtermann 14a86c9ea7 Autogen: Protected calls to cmSystemTools::CollapseCombinedPath 2018-04-03 17:20:29 +02:00
Brad King 561238bb6f Merge topic 'FPHSA-include' 
d6883801cd Find*: always include FPHSA shipped with CMake

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1910
 2018-04-03 09:38:41 -04:00
Brad King a01caf81a6 Merge topic 'FindDCMTK-includes' 
5c948aa50d FindDCMTK: use CheckIncludeFiles instead of open coding it

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1911
 2018-04-03 09:38:09 -04:00