mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-24 15:18:26 -05:00
Code Issues Packages Projects Releases Wiki Activity
42,145 Commits 2 Branches 401 Tags
c30f9b1cdefc2fa26d89bc692001a4f1050f6038
Commit Graph

42145 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad King c30f9b1cde Merge topic 'functional-callbacks' 
8c92db829b MessageCallback: Remove unused bool& argument
bcee24aecc Use `std::function` for callbacks

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: vvs31415 <vstakhovsky@fastmail.com>
Acked-by: Daniel Pfeifer <daniel@pfeifer-mail.de>
Merge-request: !2872
 2019-01-30 08:10:27 -05:00
Brad King bcec7d0778 Merge topic 'copyfile-stdstring' 
c31b6e616d cmSystemTools: copy file member functions accept std::string params

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2877
 2019-01-30 08:08:59 -05:00
Brad King 8ec149003e Merge topic 'UseJava-if-cleanup' 
95ef818c7d UseJava: clean-up if() expressions

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2871
 2019-01-30 08:07:22 -05:00
Brad King 340e8a9c3d Merge branch 'release-3.13' 2019-01-30 08:05:10 -05:00
Kitware Robot d21769d5dd CMake Nightly Date Stamp 2019-01-30 00:01:07 -05:00
Brad King d75fec5a88 Merge topic 'tidy-use-equals-default' 
094f01d0f0 cleanup: Prefer compiler provided special member functions
55671b41d2 clang-tidy: Use `= default`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Brad King <brad.king@kitware.com>
Merge-request: !2841
 2019-01-29 14:07:24 -05:00
Regina Pfeifer 8c92db829b MessageCallback: Remove unused bool& argument 2019-01-29 16:35:53 +01:00
Vitaly Stakhovsky c31b6e616d cmSystemTools: copy file member functions accept std::string params 
Cleaned up `c_str()`s.
`cmSystemTools::CopyFileIfDifferent()` removed as redundant.
 2019-01-29 10:34:18 -05:00
Regina Pfeifer bcee24aecc Use std::function for callbacks 2019-01-29 16:32:52 +01:00
Brad King 9620cb935a Merge topic 'add_consistent_verbose_build_flag' 
66801f4d40 cmake: Add tests for verbose output to --build mode
439fe2e253 cmake: Add options for verbose output to --build mode
638667efa2 cmake: cmcmd.cxx fix "The arguments are" comments
3ca4402966 ctest: Fix --build-and-test without --build-target on Xcode
cb6c233ecc cmake: Add -hideShellScriptEnvironment xcodebuild option
1a45266cb5 cmGlobalGenerator: Add a class that represent the build command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2708
 2019-01-29 09:19:39 -05:00
Brad King 60c06620a6 Merge topic 'cmoutputconverter-simplify' 
b6a957c969 cmOutputConverter: move ConvertToRelativePath to cmStateDirectory.

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2831
 2019-01-29 09:18:42 -05:00
Brad King 90ac5e6384 Merge topic 'message-stdstring' 
186d9b083d cmSystemTools::Message: Add overload accepting std::string

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2869
 2019-01-29 09:17:51 -05:00
Brad King e7be5638a0 Merge topic 'ftc-string' 
2fc69ba0b3 cmFileTimeComparison: use std::string arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2868
 2019-01-29 09:16:58 -05:00
Brad King 5134e11ee4 Merge topic 'update-tutorial' 
0e2cdacf7b Tests: Update style of c++ code snippets in Tutorial directions
f2ddedfa58 Tests: Update CMake tutorial
438651506a Tests: Make ExternalProjectLocal independent of Tutorial directory

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2731
 2019-01-29 09:15:44 -05:00
Brad King fa7077e741 Merge topic 'vs-host-arch' 
0fd742a6ff VS: Teach VS 2019 generator to select host tools matching host arch
17cef3806d VS: Add support for explicit 32-bit toolset selection via host=x86
bf774e521b VS: Remove stray semicolons from VS 2019 implementation
142e67eac6 VS: Use internal abstraction for VCTargetsPath host arch

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2870
 2019-01-29 09:05:51 -05:00
Brad King eeb34232fc Merge topic 'add-missing-macos-framework' 
475e78d907 macOS: Add missing explicit dependency on CoreServices framework

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2873
 2019-01-29 08:59:59 -05:00
Brad King bcb1297faf Merge topic 'autogen_reenable_implicit_include_dirs' 
03dbb62d31 Autogen: Reenable passing compiler implicit include directories to moc
5f34bdc7f9 cmLocalGenerator: Refactor `GetIncludeDirectoriesImplicit` method
f16dfdf71f cmLocalGenerator: Simplify `GetIncludeDirectories`

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2864
 2019-01-29 08:59:06 -05:00
Brad King a57fcfa3e0 Merge branch 'add-missing-macos-framework' into release-3.13 
Merge-request: !2873
 2019-01-29 07:00:43 -05:00
Chuck Atkins 475e78d907 macOS: Add missing explicit dependency on CoreServices framework 
On Apple, the implementation of cmGlobalXCodeGenerator::Open uses
LSOpenCFURLRef from CoreServices.  This get's transitively pulled in
from CMake's libuv build but ends up generating a linker error when
using an external libuv.  This explicitly adds the appropriate
dependency.
 2019-01-29 06:59:24 -05:00
Kitware Robot 62c0b1aebb CMake Nightly Date Stamp 2019-01-29 00:01:06 -05:00
Brad King 0fd742a6ff VS: Teach VS 2019 generator to select host tools matching host arch 
This generator is new so we can introduce the long-desired behavior
of selecting ``host=x64`` tools by default on x64 hosts.
 2019-01-28 12:58:21 -05:00
Marc Chevrier 95ef818c7d UseJava: clean-up if() expressions 
Fixes: #18836
 2019-01-28 18:43:50 +01:00
Brad King 17cef3806d VS: Add support for explicit 32-bit toolset selection via host=x86 
Generalize the ``host=x64`` option in `CMAKE_GENERATOR_TOOLSET`
to also support ``host=x86``.
 2019-01-28 11:22:50 -05:00
Brad King bf774e521b VS: Remove stray semicolons from VS 2019 implementation 2019-01-28 11:22:31 -05:00
Brad King 142e67eac6 VS: Use internal abstraction for VCTargetsPath host arch 
Call our internal host architecture lookup method rather than directly
accessing a member used by its implementation.
 2019-01-28 11:16:02 -05:00
Robert Maynard 66801f4d40 cmake: Add tests for verbose output to --build mode 2019-01-28 10:01:55 -05:00
Florian Maushart 439fe2e253 cmake: Add options for verbose output to --build mode 
While we already support `VERBOSE` environment variable and
`CMAKE_VERBOSE_MAKEFILE` cached variable, add `-v` and `--verbose`
command line options to be able to activate verbose output directly from
CMake's build tool mode command line.

Also make `msbuild` honor the verbosity setting. `xcodebuild` still
doesn't honor the verbosity setting as it will need a policy added
and reworking of cmGlobalGenerator and cmsys to support
multiple command invocation.
 2019-01-28 09:44:50 -05:00
Vitaly Stakhovsky 186d9b083d cmSystemTools::Message: Add overload accepting std::string 2019-01-28 09:35:51 -05:00
Vitaly Stakhovsky 2fc69ba0b3 cmFileTimeComparison: use std::string arguments 2019-01-28 09:09:59 -05:00
Brad King fc96aa03f8 Merge topic 'commit-ref-in-prose' 
939dc9a58c Help: prefer commit hashes in commit references

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2854
 2019-01-28 08:45:24 -05:00
Sebastian Holtermann 03dbb62d31 Autogen: Reenable passing compiler implicit include directories to moc 
Since commit 5990ecb741 (Compute implicit include directories from
compiler output, 2018-12-07) we now have compiler implicit include
directory computation for gcc and clang.  It should be safe now to pass
these to `moc`.  This patch re-enables passing the compiler implicit
include directories to `moc`, which was disabled due to issue #18669.

Fixes: #18041
Issue: #18669
 2019-01-28 08:41:37 -05:00
Sebastian Holtermann 5f34bdc7f9 cmLocalGenerator: Refactor GetIncludeDirectoriesImplicit method 
Use a dedicated `std::set` for implicit include directories instead
of (ab)using the emitted variable.  This in combination with lambdas
makes it easier to comprehend which paths are emitted.

For the implicit include directories we used to omit the
`CMAKE_SYSROOT_COMPILE`/`CMAKE_SYSROOT` prefix.  This has been changed and
the implicit paths are returned prefixed.  Implicit include directory returning
is only ever used by QtAutoGen which requires prefixed paths.  QtAutoGen passes
the (implicit) include paths to the `moc` which isn't aware of
`CMAKE_SYSROOT_COMPILE`/`CMAKE_SYSROOT`.
 2019-01-28 08:41:28 -05:00
Sebastian Holtermann f16dfdf71f cmLocalGenerator: Simplify GetIncludeDirectories 
This patch strips the `stripImplicitDirs` and `appendAllImplicitDirs`
parameters from the `cmLocalGenerator::GetIncludeDirectories` method and makes
it a wrapper into the new `cmLocalGenerator::GetIncludeDirectoriesImplicit`
method.  `cmLocalGenerator::GetIncludeDirectoriesImplicit` is the renamed old
implementation of `cmLocalGenerator::GetIncludeDirectories` and still
accepts `stripImplicitDirs` and `appendAllImplicitDirs`.

The motivation is that there's only *one* case where
`cmLocalGenerator::GetIncludeDirectories` is called with the
`stripImplicitDirs` parameter being `false` (QtAutoGen), but many other places
where it is called using the `true` default value.

QtAutoGen is modified to use `cmLocalGenerator::GetIncludeDirectoriesImplicit`
directly.  In two use cases of `cmLocalGenerator::GetIncludeDirectories`
the manually set `true` value for `stripImplicitDirs` is removed.
 2019-01-28 08:41:28 -05:00
Brad King 8e495333c0 Merge topic 'cmake-gui-s-b' 
ad0853b3d4 QtDialog: Clean up and document -S and -B options

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Robert Maynard <robert.maynard@kitware.com>
Merge-request: !2863
 2019-01-28 08:36:58 -05:00
Brad King f677a3d7de Merge branch 'release-3.13' 2019-01-28 08:30:30 -05:00
Brad King c1922c9660 Merge topic 'doxygen-escaping' 
e81fd5d5ba FindDoxygen: Escape backslashes in default values

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Julien Schueller <schueller@phimeca.com>
Merge-request: !2867
 2019-01-28 08:30:07 -05:00
Brad King f4547578aa Merge branch 'doxygen-escaping' into release-3.13 
Merge-request: !2867
 2019-01-28 08:29:28 -05:00
Brad King a844c7248d Merge topic 'cmake-E-compare_files-eol' 
a5098cad94 cmake: Add --ignore-eol option to `-E compare_files` command

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2778
 2019-01-28 08:27:03 -05:00
Taylor Braun-Jones a5098cad94 cmake: Add --ignore-eol option to -E compare_files command 
Fixes: #13007
 2019-01-28 08:24:50 -05:00
Brad King 1593e16d88 Merge topic 'get_filename_component_last_ext' 
2a9220c34d Help: Add notes for topic 'get_filename_component_last_ext'
edda30d0f5 Tests: Add tests for LAST_EXT and NAME_WLE
7a25ef326b Help: Add documentation for new get_filename_component components
e50a36df48 cmGetFilenameComponentCommand: Add more components

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2853
 2019-01-28 08:21:50 -05:00
Brad King 2a9220c34d Help: Add notes for topic 'get_filename_component_last_ext' 2019-01-28 08:20:24 -05:00
Brad King dc752c9d2d Merge topic 'implicit-incs-upd' 
2e91627dea ParseImplicitIncludeInfo: add Fortran implicit include handling
568343767e ParseImplicitIncludeInfo: handle/add SunPro, XL, and -nostdinc test cases

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2855
 2019-01-28 08:08:36 -05:00
Brad King ce57bc8e04 Merge topic 'vs2019' 
626c51f47b VS: Update for Visual Studio 2019 Preview 2
fd45cbf40e VS: Fix `/MANIFESTUAC:` link flag mapping for v142
db35e3cfd6 VS: Fix support for '/guard:cf' linker flag for v142
533f95c847 VS: Map the link `/debug` flag for v142
d2fcc6748a VS: Fix `/MANIFESTUAC:NO` link flag mapping for v142
a7973ccb53 VS: Populate `/permissive` flag table entry for v142
049410c0b6 VS: Populate `/JMC-` flag table entry for v142
43aa632f57 VS: Populate `-Qspectre-` flag table entry for v142
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2856
 2019-01-28 08:07:28 -05:00
Brad King 70fabb8f25 Merge topic 'png-optimize' 
b9e6d04558 Reduce size of PNG images
880e380599 CPack: Replace corrupted background png with original

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2852
 2019-01-28 08:04:51 -05:00
Brad King f3f9ca1d7c Merge branch 'release-3.13' 2019-01-28 08:03:52 -05:00
Brad King 6d57201868 Merge topic 'intel-compile-features' 
fc40bca590 Intel: Record support for relaxed constexpr by version 18.0.5

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2862
 2019-01-28 07:59:30 -05:00
Brad King f411e936be Merge topic 'FindPythonInterp-version-fix' 
08dee696b5 FindPythonInterp: Do not assume any version if test script fails

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !2835
 2019-01-28 07:58:45 -05:00
Kitware Robot f832f15509 CMake Nightly Date Stamp 2019-01-28 00:01:05 -05:00
Zack Galbreath 0e2cdacf7b Tests: Update style of c++ code snippets in Tutorial directions 2019-01-27 16:03:00 -05:00
Betsy McPhail f2ddedfa58 Tests: Update CMake tutorial 
Latest material from data.kitware.com -> Collections -> Courses -> CMake.
 2019-01-27 16:03:00 -05:00