mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-20 21:50:53 -06:00
Code Issues Packages Projects Releases Wiki Activity
50,647 Commits 2 Branches 386 Tags
fcf3fc4447e8eaa9cdd67223d9bf6ca8975632fa
Commit Graph

50647 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King
fcf3fc4447 cmNinjaTargetGenerator: Clarify method names 2020-11-06 11:43:52 -05:00
Brad King
fe5d0849db cmNinjaTargetGenerator: Consolidate redundant methods 2020-11-06 11:43:51 -05:00
Brad King
a117101fbd Merge branch 'release-3.19' into master 2020-11-06 10:22:07 -05:00
Brad King
7a04f45722 CMake 3.19.0-rc3 v3.19.0-rc3 2020-11-06 09:19:57 -05:00
Brad King
ffda92d4bf Merge topic 'clang-tidy-for-objc' 
1134064e22 clang-tidy: allow OBJC and OBJCXX

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5467
 2020-11-06 08:05:00 -05:00
Brad King
cc2d849e69 Merge topic 'cmprop-improve' 
f6e7d5f3a0 Reduce the scope of temporary cmProp variables and other improvements

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5471
 2020-11-06 08:04:26 -05:00
Brad King
7b6a9ac8e7 Merge topic 'android-build-type' 
3dae826e43 Android: default to RelWithDebInfo

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5465
 2020-11-06 08:03:27 -05:00
Brad King
5696be33a6 Merge topic 'FindICU-naming' 
21cb588629 FindICU: Correct variable names to match documentation

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5451
 2020-11-06 08:02:30 -05:00
Brad King
02d6c98210 Merge topic 'cpack-nuget' 
41ae7c4e51 CPack/NuGet: Add settings for the license, icon, and language

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5415
 2020-11-06 08:01:41 -05:00
Brad King
3a69c7779a Merge branch 'release-3.19' 2020-11-06 07:58:55 -05:00
Brad King
e0438b05de Merge topic 'apple-v4-tbd-file-arch-lookup' 
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5470
 2020-11-06 07:58:55 -05:00
Brad King
b80e39d0f6 Merge topic 'apple-v4-tbd-file-arch-lookup' into release-3.19 
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5470
 2020-11-06 07:58:54 -05:00
Brad King
2e86b0ec51 Merge branch 'release-3.19' 2020-11-06 07:57:51 -05:00
Brad King
dd8c91a4f3 Merge topic 'cmake-gui-file-dialog-crash' into release-3.19 
5f782119c8 cmake-gui: Restore workaround for crash in file dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5472
 2020-11-06 07:57:51 -05:00
Brad King
a0453a7f0c Merge topic 'cmake-gui-file-dialog-crash' 
5f782119c8 cmake-gui: Restore workaround for crash in file dialog

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5472
 2020-11-06 07:57:51 -05:00
Brad King
d1039f74a9 Merge branch 'release-3.19' 2020-11-06 07:55:48 -05:00
Brad King
b065b1ad09 Merge topic 'FindPostgreSQL-13' 
f3f09f1c96 FindPostgreSQL: support version 13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5468
 2020-11-06 07:55:48 -05:00
Brad King
0adaed609f Merge topic 'FindPostgreSQL-13' into release-3.19 
f3f09f1c96 FindPostgreSQL: support version 13

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5468
 2020-11-06 07:55:47 -05:00
Brad King
2b2ca47eda Merge branch 'release-3.19' 2020-11-06 07:43:03 -05:00
Brad King
a775a6a18b Merge topic 'xcode-inherit-paths' into release-3.19 
bffb17be3d Xcode: Inherit target library and framework search paths from project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5463
 2020-11-06 07:43:03 -05:00
Brad King
b2552d50da Merge topic 'xcode-inherit-paths' 
bffb17be3d Xcode: Inherit target library and framework search paths from project

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5463
 2020-11-06 07:43:03 -05:00
Craig Scott
dd547c6a74 Merge branch 'release-3.19' 2020-11-06 05:50:53 -05:00
Craig Scott
9201b3fa40 Merge topic 'help_ctest_cuda_memcheck' 
e620bb7293 Help: Add cuda-memcheck to CTest documentation
fb98883e2b CTest: Add cuda-memcheck to Dart and CTest module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5469
 2020-11-06 05:50:53 -05:00
Craig Scott
10b36244b6 Merge topic 'help_ctest_cuda_memcheck' into release-3.19 
e620bb7293 Help: Add cuda-memcheck to CTest documentation
fb98883e2b CTest: Add cuda-memcheck to Dart and CTest module

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5469
 2020-11-06 05:50:52 -05:00
Kitware Robot
35594cd434 CMake Nightly Date Stamp 2020-11-06 00:01:08 -05:00
Brad King
5f782119c8 cmake-gui: Restore workaround for crash in file dialog 
In commit ce9dbceb42 (QtDialog: remove Qt4-only code, 2020-06-02,
v3.19.0-rc1~712^2~1) we removed an event filter that was thought to be
necessary only as a workaround for a bug in Qt.  However, that bug was
fixed in Qt 4.5, and the file dialog still crashes as of Qt 5.14 without
the filter.  Restore the workaround pending further investigation.

Fixes: #21400
 2020-11-05 14:50:45 -05:00
Andrew Fuller
1134064e22 clang-tidy: allow OBJC and OBJCXX 2020-11-05 11:39:32 -08:00
Vitaly Stakhovsky
f6e7d5f3a0 Reduce the scope of temporary cmProp variables and other improvements 2020-11-05 11:07:39 -05:00
Bob Apthorpe
41ae7c4e51 CPack/NuGet: Add settings for the license, icon, and language 
Also update the XML Schema.

Fixes: #21348
 2020-11-05 10:49:25 -05:00
Tor Arne Vestbø
4c6797e03e Apple: Update SDK architecture detection for tbd file version 4 
Extend the `.tbd` parsing from commit 170e598add (iOS: Fix detection of
supported SDK architectures, 2020-04-16, v3.17.2~11^2) to support `.tbd`
file version 4.
 2020-11-05 10:21:23 -05:00
Tobias Ribizel
e620bb7293 Help: Add cuda-memcheck to CTest documentation 
Issue: #21388
 2020-11-05 10:05:01 -05:00
Tobias Ribizel
fb98883e2b CTest: Add cuda-memcheck to Dart and CTest module 
Issue: #21388
 2020-11-05 10:04:44 -05:00
Pavel Cernohorsky
f3f09f1c96 FindPostgreSQL: support version 13 2020-11-05 07:59:45 -05:00
Brad King
c43b0505a5 Merge topic 'makefile-CMAKE_EXPORT_COMPILE_COMMANDS-ASM' 
52152409c3 Makefiles: Honor CMAKE_EXPORT_COMPILE_COMMANDS for ASM

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5464
 2020-11-05 07:58:37 -05:00
Brad King
d416b0996a Merge topic 'GNUInstallDirs-dir' 
a61007b3b0 Tests: Add RunCMake.GNUInstallDirs case for get_absolute_install_dir
229b5ee994 GNUInstallDirs: Add dir argument to GNUInstallDirs_get_absolute_install_dir

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5450
 2020-11-05 07:56:30 -05:00
Brad King
a9e2b18bf3 Merge topic 'android-stl' 
4dca078829 Android: Link c++abi and android_support when necessary
738caa4d48 Android: Add options to control exceptions/rtti

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5444
 2020-11-05 07:55:46 -05:00
Brad King
d720cd847e Merge topic 'cmprop-source' 
c7b50349de cmSourceFile::GetPropertyForUser: return cmProp

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5462
 2020-11-05 07:54:03 -05:00
Craig Scott
73974d84c2 Merge topic 'abi-byte-order' 
f511a1c009 CMakeDetermineCompilerABI: Detect byte order as part of check
606b34b3a6 CMakeDetermineCompilerABI: Look for more INFO strings in test binary

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Juan Ramos <juan.ramos@amd.com>
Acked-by: John Palmer <juanr0911@gmail.com>
Merge-request: !5460
 2020-11-05 07:47:59 -05:00
Gusts Kaksis
bffb17be3d Xcode: Inherit target library and framework search paths from project 
Xcode has multiple levels of build settings with priority in descending
order:

1. Target
2. Project
3. Workspace
4. SDK defaults

`CMAKE_XCODE_ATTRIBUTE_*` path variables add these to project level, but
linked frameworks and libraries override this in target level.  Add the
`$(inherited)` macro to keep both in the final list.

Fixes: #21387
 2020-11-05 13:48:54 +02:00
Kitware Robot
1588e65f4c CMake Nightly Date Stamp 2020-11-05 00:01:07 -05:00
Haibo Huang
3dae826e43 Android: default to RelWithDebInfo 2020-11-04 14:20:13 -08:00
Maxime Girard
52152409c3 Makefiles: Honor CMAKE_EXPORT_COMPILE_COMMANDS for ASM 
Generate build command for assembly file in `compile_command.json`.

Issue: #20059
 2020-11-04 15:36:47 -05:00
Brad King
a61007b3b0 Tests: Add RunCMake.GNUInstallDirs case for get_absolute_install_dir 2020-11-04 15:10:25 -05:00
Roger Leigh
229b5ee994 GNUInstallDirs: Add dir argument to GNUInstallDirs_get_absolute_install_dir 
Fixes: #21152
 2020-11-04 15:10:21 -05:00
Haibo Huang
4dca078829 Android: Link c++abi and android_support when necessary 
For older NDKs we used `__android_stl_lib` to link these libraries, but
the `CMAKE_ANDROID_NDK_TOOLCHAIN_UNIFIED` code path does not use that.
Link the libraries the way the NDK toolchain file does:

  43b2de34ef/build/cmake/android.toolchain.cmake (368)
 2020-11-04 14:21:26 -05:00
Haibo Huang
738caa4d48 Android: Add options to control exceptions/rtti 
With the NDK's `android.toolchain.cmake`, the user can control whether
exceptions/rtti is enabled using `ANDROID_CPP_FEATURES`:

  43b2de34ef/build/cmake/android.toolchain.cmake (548)

Add `CMAKE_ANDROID_RTTI` and `CMAKE_ANDROID_EXCEPTIONS` to support that.
 2020-11-04 14:18:03 -05:00
Vitaly Stakhovsky
c7b50349de cmSourceFile::GetPropertyForUser: return cmProp 
also fix GetSafeProperty() return type
 2020-11-04 10:11:54 -05:00
Brad King
f511a1c009 CMakeDetermineCompilerABI: Detect byte order as part of check 
We already detect `sizeof(void*)`.  Detect the byte order as part of the
same check.

Issue: #21392
 2020-11-04 10:08:13 -05:00
Brad King
606b34b3a6 CMakeDetermineCompilerABI: Look for more INFO strings in test binary 
Explicitly use only the first occurrence of each matched INFO string
since previously we only extracted the first two anyway.
 2020-11-04 09:45:28 -05:00
Brad King
39f32f1210 Merge topic 'cmake_path-deactivation' into release-3.19 
1c912056a1 cmake_path: remove new command from 3.19

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5459
 2020-11-04 08:15:47 -05:00