mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-31 03:40:32 -06:00
Code Issues Packages Projects Releases Wiki Activity
39,231 Commits 2 Branches 390 Tags
ff18dce5ed4a46d12e6a79954cc35ef078addcce
Commit Graph

39231 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vitaly Stakhovsky
ff18dce5ed cmVisualStudio10TargetGenerator: Properly escape attributes 
In addition to common XML escape characters, attributes require escaping
the double quote character. A new function, cmVS10EscapeAttr is added and
used where appropriate.
 2018-04-05 21:20:16 -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
Kitware Robot
aae2bcf8dd CMake Nightly Date Stamp 2018-04-05 00:01:04 -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
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
Brad King
cad7385ab6 Merge topic 'android-clang-std-flags' 
12e6796b62 Android: Do not pass non-existent Clang -std flags

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1913
 2018-04-03 09:36:37 -04:00
Brad King
5ab647cdde Merge topic 'fortran-fpp' 
445d6781e6 Fortran: Add support for .fpp extensions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1912
 2018-04-03 09:34:45 -04:00
Marc Chevrier
8ab4e38373 UseSWIG: Add new behavior for better support files management 
fixes: #17840
 2018-04-03 12:44:55 +02:00
Marc Chevrier
b1fd2bbe75 FindPython: enhance multiple major versions lookup 2018-04-03 09:41:19 +02:00
Kitware Robot
e3ce4d7a28 CMake Nightly Date Stamp 2018-04-03 00:01:07 -04:00
Brad King
12e6796b62 Android: Do not pass non-existent Clang -std flags 
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.
 2018-04-02 15:15:20 -04:00
Rolf Eike Beer
5c948aa50d FindDCMTK: use CheckIncludeFiles instead of open coding it 
While at it remove a needless status message.
 2018-04-02 17:59:45 +02:00
Brad King
445d6781e6 Fortran: Add support for .fpp extensions 
Compilers such as `gfortran` recognize `.fpp` extensions to mean a
Fortran source on which the preprocessor should run.

Fixes: #17869
 2018-04-02 11:07:55 -04:00
Marc Chevrier
438429d6fe UseSWIG: Rework tests 2018-04-02 16:24:13 +02:00
Brad King
e42fcb117f Merge topic 'remove-vs8-generator' 
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
 2018-04-02 10:09:15 -04:00
Brad King
eb80af9093 Drop Visual Studio 8 2005 generator 
This generator has been deprecated since CMake 3.9.  Remove it.
 2018-04-02 10:08:10 -04:00
Brad King
a76e23eabb Merge topic 'variable-CMAKE_FOLDER' 
df535ad846 Add CMAKE_FOLDER variable to initialize FOLDER target property

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1896
 2018-04-02 10:06:39 -04:00
Brad King
59713e856d Merge topic 'FindCUDA-nvcc-executable-env' 
23119366e9 FindCUDA: Make nvcc configurable via CUDA_NVCC_EXECUTABLE env var

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1899
 2018-04-02 10:05:13 -04:00
Brad King
8f5b6962c9 Merge topic 'update-kwsys' 
4c90e94368 Merge branch 'upstream-KWSys' into update-kwsys
b66f18c84f KWSys 2018-03-29 (488f2031)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1902
 2018-04-02 10:03:12 -04:00
Brad King
1b6ec4b9e3 Merge topic 'features-c++20' 
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
 2018-04-02 10:01:23 -04:00
Brad King
5d5e1e6917 Merge topic 'features-msvc-c' 
a53cf69022 Features: Record C features for MSVC
e62dfeccb1 Features: Do not assume c_restrict support in CompileFeatures test
c22cdf78d7 Features: Fix CompileFeatures test checks for C

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Harry Mallon <hjmallon@gmail.com>
Merge-request: !1897
 2018-04-02 10:00:20 -04:00