mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-30 11:08:51 -06:00
Code Issues Packages Projects Releases Wiki Activity
39,194 Commits 2 Branches 390 Tags
0ad329f7c09f67aa2ebae059fbbef6266c8f6515
Commit Graph

39194 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Rolf Eike Beer
d6883801cd Find*: always include FPHSA shipped with CMake 2018-04-02 10:48:31 +02:00
Kitware Robot
a0b5dade9a CMake Nightly Date Stamp 2018-04-02 00:01:04 -04:00
Kitware Robot
323d6b4c75 CMake Nightly Date Stamp 2018-04-01 00:01:07 -04:00
Kitware Robot
1d5ad1fdee CMake Nightly Date Stamp 2018-03-31 00:01:09 -04:00
Kitware Robot
2fc79bcb03 CMake Nightly Date Stamp 2018-03-30 00:01:09 -04:00
Marc B
df535ad846 Add CMAKE_FOLDER variable to initialize FOLDER target property 
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}")
 2018-03-29 13:19:13 -04:00
Brad King
4c90e94368 Merge branch 'upstream-KWSys' into update-kwsys 
* upstream-KWSys:
  KWSys 2018-03-29 (488f2031)
 2018-03-29 11:41:57 -04:00
KWSys Upstream
b66f18c84f KWSys 2018-03-29 (488f2031) 
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/
 2018-03-29 11:41:57 -04:00
Brad King
e7af91d026 Tests: Remove unused file from Tutorial Step7 test 
The `build2.cmake` script looks like it was accidentally
committed after being created for local testing.
 2018-03-29 11:27:36 -04:00
Edward Z. Yang
23119366e9 FindCUDA: Make nvcc configurable via CUDA_NVCC_EXECUTABLE env var 
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>
 2018-03-29 10:48:02 -04:00
Brad King
a53cf69022 Features: Record C features for MSVC 
The MSVC C compiler has no notion of C language standards or flags.
Tell CMake to assume that all language standards are available.
Record available C language features depending on the version of
the compiler.

Fixes: #17858
 2018-03-29 10:40:13 -04:00
Brad King
894a41fc27 Merge topic 'vs-simplify' 
80767dd50e VS: Simplify XML code

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1895
 2018-03-29 10:24:06 -04:00
Brad King
3272677e63 Merge topic 'genex-TARGET_NAME_IF_EXISTS' 
7b173a2933 genex: Add TARGET_NAME_IF_EXISTS expression

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1890
 2018-03-29 10:21:48 -04:00
Brad King
a03105ac8c Merge topic 'remove-unused-variable' 
fd6c452986 cmTarget: Remove unused variable

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1898
 2018-03-29 10:17:18 -04:00
Brad King
cdc6dd888e Merge topic 'gcov-warning-message' 
ae1cbff07f CTest: The "Could not find gcov." message should not be a warning

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1894
 2018-03-29 10:16:27 -04:00
Kitware Robot
08b49c277d CMake Nightly Date Stamp 2018-03-29 00:01:07 -04:00
Brad King
fd6c452986 cmTarget: Remove unused variable 
Remove an unused variable and its containing local scope accidentally
left by commit v3.11.0-rc1~44^2 (Reduce allocation of temporary values
on heap, 2018-01-25).
 2018-03-28 11:09:56 -04:00
Brad King
e62dfeccb1 Features: Do not assume c_restrict support in CompileFeatures test 
Define `EXPECT_C_RESTRICT` separately for each compiler.
 2018-03-28 10:54:43 -04:00
Brad King
c22cdf78d7 Features: Fix CompileFeatures test checks for C 
Compare the HAVE_ and EXPECT_ macros as we do for CXX.
 2018-03-28 10:54:41 -04:00
Brad King
98f23da8df Merge branch 'release-3.11' 2018-03-28 08:58:55 -04:00
Alex Turbov
7b173a2933 genex: Add TARGET_NAME_IF_EXISTS expression 
Define `$<TARGET_NAME_IF_EXISTS:tgt>` to mean `tgt` if the target
exists and otherwise an empty string.
 2018-03-28 08:38:00 -04:00
Betsy McPhail
ae1cbff07f CTest: The "Could not find gcov." message should not be a warning 
It now matches the log level of other coverage messages.
 2018-03-28 08:32:46 -04:00
Brad King
61fd4c7420 CMake 3.11.0 v3.11.0 2018-03-28 07:26:56 -04:00
Brad King
5ee25f01ae Merge branch 'release-3.11' 2018-03-28 07:25:06 -04:00
Brad King
9dd7776cd9 Merge topic 'ctest_update-memory-problems' 
27f033550a ctest_update: Fix crash when handling svn externals
75e8af3354 cmSystemTools: Fix ParseArguments out-of-bounds read

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1893
 2018-03-28 07:23:47 -04:00
Kitware Robot
cf39c14f46 CMake Nightly Date Stamp 2018-03-28 00:01:07 -04:00
Vitaly Stakhovsky
80767dd50e VS: Simplify XML code 
Get rid of suffix arguments
 2018-03-27 17:39:19 -04:00
Brad King
36881ee416 Merge branch 'ctest_update-memory-problems' into release-3.11 
Merge-request: !1893
 2018-03-27 08:51:01 -04:00
Brad King
27f033550a ctest_update: Fix crash when handling svn externals 
Refactoring in commit v3.9.0-rc1~156^2 (c++: prefer vectors over lists,
2017-05-04) switched `cmCTestSVN::Repositories` from `std::list` to
`std::vector`.  This can cause re-allocation when svn externals are
processed and break the `RootInfo` pointer that is supposed to point at
the first repository element.  Switch back to `std::list` so that the
address remains stable.

Fixes: #17854
 2018-03-27 08:46:20 -04:00
Brad King
75e8af3354 cmSystemTools: Fix ParseArguments out-of-bounds read 
When checking for a Windows-style leading path, do not read past the
null terminator.

Issue: #17854
 2018-03-27 08:46:20 -04:00
Craig Scott
d5f0b2df8e Merge topic 'cmake_minimum_required-forward-compat' 
8dc97acb03 cmake_minimum_required: Tolerate unknown future arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1888
 2018-03-27 08:16:46 -04:00
Brad King
760f83d5c0 Merge branch 'release-3.11' 2018-03-27 08:11:01 -04:00
Brad King
99f3f6d528 Merge topic 'const-members' 
85468e0754 cmComputeLinkInformation: make some members const

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1886
 2018-03-27 07:51:34 -04:00
Brad King
df0cfdf60e Merge topic 'vs-options-movexml' 
a0d9429bd7 cmVisualStudioGeneratorOptions: Move XML code to subclasses

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1885
 2018-03-27 07:50:55 -04:00