Commit Graph

59226 Commits

Author SHA1 Message Date
Matthew Woehlke
da45136ce3 CMakeTestCXXCompiler.cmake: Improve logging consistency
Use "C++ compiler" rather than "CXX compiler" in certain logging
messages. This improves both internal consistency (as "C++ compiler" was
already used elsewhere) and consistency with e.g. the equivalent logging
for the "Objective-C[++] compiler".
2022-09-28 11:49:01 -04:00
Markus Ferrell
37fceb6fd3 Tutorial: Update step 4 style 2022-09-28 11:38:28 -04:00
Brad King
381fc36880 Merge topic 'use-try_compile-source-from'
41f7b1169a Modules: Use new SOURCES_FROM_* try_compile (2/2)
db76876db5 Modules: Use new SOURCES_FROM_* try_compile (1/2)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7717
2022-09-28 10:42:05 -04:00
Brad King
43a0206dad Merge topic 'vs11-deprecate'
6c1337cb79 Deprecate Visual Studio 11 2012 generator
5faf145a5b Tests: Drop unused files from RunCMake.CommandLine

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7720
2022-09-28 10:40:32 -04:00
Brad King
b9968f3006 Merge topic 'cmake-presets-workflow'
374d82bbcd cmake: Add --workflow mode
e316812884 CMakePresets.json: Add workflow presets to schema

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7711
2022-09-28 10:38:41 -04:00
Matthew Woehlke
f891a75d5c Tests: Test CMakeTest*Compiler.cmake fallbacks
Add tests that explicitly test the fallback tests of the modules which
test for a functional [Obj]C[xx] compiler, bypassing the ABI tests.
Due to the ABI test short-circuiting added by commit 1d21dd0f7c
(enable_language: Assume compiler works if ABI detection compiles,
2020-05-25, v3.18.0-rc1~93^2), this logic is likely not getting tested
otherwise.
2022-09-28 10:27:31 -04:00
Silvio Traversaro
e0a62b84b5 FindGLUT: On Windows and with multiple config generator do not use pkg-config 2022-09-28 09:40:25 +02:00
Kitware Robot
17250fe2c9 CMake Nightly Date Stamp 2022-09-28 00:01:18 -04:00
Matthew Woehlke
41f7b1169a Modules: Use new SOURCES_FROM_* try_compile (2/2)
Modify some additional modules that ship with CMake to use the new
SOURCES_FROM_* arguments to try_compile / try_run as added by commits
cb14ae2b87 (try_compile: Add SOURCE_FROM_{ARG,VAR}, 2022-09-21) and
611d801790 (try_compile: Add SOURCE_FROM_FILE, 2022-09-22). This covers
modules that need to read and alter a template source file, which were
not addressed in the previous commit.

Note that FindOpenACC.cmake does not actually need configure_file
functionality; it appears to have inherited the (gratuitous) use thereof
from FindOpenMP.cmake, with which its code bears significant similarity.
2022-09-27 13:29:52 -04:00
Matthew Woehlke
db76876db5 Modules: Use new SOURCES_FROM_* try_compile (1/2)
Modify some modules that ship with CMake to use the new SOURCES_FROM_*
arguments to try_compile / try_run as added by commits cb14ae2b87
(try_compile: Add SOURCE_FROM_{ARG,VAR}, 2022-09-21) and 611d801790
(try_compile: Add SOURCE_FROM_FILE, 2022-09-22). This covers users which
previously either used an existing file (but sometimes needed to rename
it), or which wrote out their source in entirety. It does NOT cover
users that actually need configure_file functionality, as those will be
more involved to update and will thus be tackled in part 2.
2022-09-27 13:29:52 -04:00
Brad King
6c1337cb79 Deprecate Visual Studio 11 2012 generator
Update documentation to mark the generator deprecated.  Add a warning at
the end of generation plus an option to turn off the warning.
2022-09-27 11:45:50 -04:00
Brad King
5faf145a5b Tests: Drop unused files from RunCMake.CommandLine
Remove files missed by commit 8d6f015d59 (Drop Visual Studio 10 2010
generator, 2022-09-26).
2022-09-27 11:45:29 -04:00
Kyle Edwards
374d82bbcd cmake: Add --workflow mode
Fixes: #23118
2022-09-27 11:09:06 -04:00
Brad King
164a156c7c Merge topic 'remove-vs10-generator'
8d6f015d59 Drop Visual Studio 10 2010 generator

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7718
2022-09-27 10:32:11 -04:00
Brad King
2992d4057a Merge topic 'drop-try_run-macro'
4b2e765025 Drop try_run macro from CMake's own build

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7719
2022-09-27 10:31:13 -04:00
Brad King
50b668ddc8 Merge topic 'add_subdirectory_system'
2eb30a7036 add_subdirectory: Add SYSTEM option

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7399
2022-09-27 10:28:49 -04:00
Brad King
954b861dba Merge topic 'cpack-nsis-arguments-command-line'
d1613ac880 CPack/NSIS: Add options to set makensis arguments

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7715
2022-09-27 10:26:12 -04:00
Brad King
a57e7350d5 Merge topic 'vs-dotnet-sdk-output-paths'
7671d71299 VS: Fix target output paths in SDK-style projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7713
2022-09-27 10:25:21 -04:00
Brad King
bb00bf9da1 Merge branch 'release-3.24' 2022-09-27 10:20:30 -04:00
Brad King
120945587f Merge topic 'ctest_ninja_full_output'
65260d6c1e ctest: only report make-level errors when no others are found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7710
2022-09-27 10:20:30 -04:00
Brad King
dc2358fe84 Merge topic 'ctest_ninja_full_output' into release-3.24
65260d6c1e ctest: only report make-level errors when no others are found

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7710
2022-09-27 10:20:29 -04:00
Brad King
a48d668d18 Merge topic 'update-libuv'
23de1675fd libuv: Update CMake-internal buildsystem for 1.44.2
ff82df301c Merge branch 'upstream-libuv' into update-libuv
a23da15596 libuv 2022-07-12 (0c1fa696)
cfe8fd6421 libuv: Update script to get libuv 1.44.2

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7709
2022-09-27 09:52:55 -04:00
Brad King
23de1675fd libuv: Update CMake-internal buildsystem for 1.44.2 2022-09-27 09:50:38 -04:00
Brad King
ff82df301c Merge branch 'upstream-libuv' into update-libuv
* upstream-libuv:
  libuv 2022-07-12 (0c1fa696)
2022-09-27 09:50:16 -04:00
libuv upstream
a23da15596 libuv 2022-07-12 (0c1fa696)
Code extracted from:

    https://github.com/libuv/libuv.git

at commit 0c1fa696aa502eb749c2c4735005f41ba00a27b8 (v1.44.2).
2022-09-27 09:49:38 -04:00
Brad King
cfe8fd6421 libuv: Update script to get libuv 1.44.2 2022-09-27 09:49:15 -04:00
Kitware Robot
97cf5a0407 CMake Nightly Date Stamp 2022-09-27 00:01:11 -04:00
Brad King
4b2e765025 Drop try_run macro from CMake's own build
Since commit 9199f7c627 (Disable arch-specific try_run in CMake itself,
2009-12-14, v2.8.2~567) we've abused an undocumented debugging feature
to override the builtin `try_run` command in CMake's own build with a
wrapper macro.  However, we've also long discouraged use of this feature
by other projects.  The purpose of the original change is outdated and
of limited use anyway, so just drop it.
2022-09-26 17:51:29 -04:00
Brad King
8d6f015d59 Drop Visual Studio 10 2010 generator
This generator has been deprecated since CMake 3.22.  Remove it.
2022-09-26 15:43:04 -04:00
Johnny Jazeix
d1613ac880 CPack/NSIS: Add options to set makensis arguments
Fixes: #23446
2022-09-26 17:58:12 +02:00
Da Quexian
2eb30a7036 add_subdirectory: Add SYSTEM option
Fixes: #22401
Signed-off-by: Da Quexian <daquexian566@gmail.com>
2022-09-26 10:56:54 -04:00
Kyle Edwards
e316812884 CMakePresets.json: Add workflow presets to schema 2022-09-26 10:53:28 -04:00
Zack Galbreath
65260d6c1e ctest: only report make-level errors when no others are found
In commit ab9ad2a6a0 (ctest: report make-level errors to CDash when
using launchers, 2020-09-24, v3.19.0-rc1~84^2~1) we taught CTest to
capture and report errors from the build command when using launchers.

This had the unintended side effect of reporting a separate build error containing
the full build output when the build command returns non-zero. To fix this problem,
we now only report build command errors from CTest launchers when no other
more specific build errors are found.

Fixes: #23991
2022-09-26 09:40:58 -04:00
Brad King
eb6e2ef7f6 Merge topic 'doc-typo-fix'
e34f543678 Help/CPACK_START_MENU_SHORTCUTS: fix monospace markup

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7714
2022-09-26 09:39:44 -04:00
Brad King
d497b06ee9 Merge topic 'cmake-presets-package-more-doc-fixes'
33b1338a92 Tests: Add test for --list-presets=all
4328deb618 Tests: Add test for cpack --list-presets
e909384062 Help: Add package preset to example presets file
16a24b0ab0 Help: List packagePresets field in cmake-presets.7

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Merge-request: !7707
2022-09-26 09:38:54 -04:00
Brad King
0bbd674cdb Merge topic 'UseSWIG-macos-csharp-suffix'
6b14de6bc5 UseSWIG: Change the library suffix to 'dylib' for C# on macOS

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7659
2022-09-26 09:36:32 -04:00
Brad King
5838093985 Merge topic 'unicode-env'
1b64aa68b9 cmSystemTools: Fix encoding of whole-environment lookup on Windows

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7705
2022-09-26 09:35:32 -04:00
Kitware Robot
ba9d51a4d3 CMake Nightly Date Stamp 2022-09-26 00:01:36 -04:00
Kitware Robot
fa2990c7b5 CMake Nightly Date Stamp 2022-09-25 00:01:09 -04:00
Kitware Robot
c87fb83426 CMake Nightly Date Stamp 2022-09-24 00:01:17 -04:00
elksson
7671d71299 VS: Fix target output paths in SDK-style projects
Set the `AppendTargetFrameworkToOutputPath` property to `false` so that
MSBuild does not append anything extra to our standard target output
paths. This fixes the `INSTALL` target, among other things.

Fixes: #23989
2022-09-23 15:56:02 -05:00
Ben Boeckel
e34f543678 Help/CPACK_START_MENU_SHORTCUTS: fix monospace markup 2022-09-23 15:50:51 -04:00
Kyle Edwards
33b1338a92 Tests: Add test for --list-presets=all 2022-09-23 10:20:03 -04:00
Kyle Edwards
4328deb618 Tests: Add test for cpack --list-presets 2022-09-23 09:40:14 -04:00
Mario Emmenlauer
6b14de6bc5 UseSWIG: Change the library suffix to 'dylib' for C# on macOS
When testing on macOS, the command `swig_add_library("mytarget")`
creates a library `libmytarget.so` instead of `libmytarget.dylib`.
Subsequently, the library is not found by `dotnet` and the
swig-generated `DllImport` statements.

Fixes: #23967
2022-09-23 09:24:15 -04:00
Brad King
98aef0929f Merge topic 'try_compile-source-from'
611d801790 try_compile: Add SOURCE_FROM_FILE
a04eaf6742 Tests: Clean up and simplify TryCompile tests
cb14ae2b87 try_compile: Add SOURCE_FROM_{ARG,VAR}

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7700
2022-09-23 08:52:13 -04:00
Brad King
14a0794b66 Merge topic 'vs-dotnet-sdk-package'
2d54d6f395 VS: Fix PACKAGE target build with SDK-style projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7704
2022-09-23 08:48:52 -04:00
Brad King
fa9a7ba82c Merge topic 'ci-debian10-clang-tidy-headers'
0ac9ec47f6 ci: add clang-tidy to Debian x86_64 base image

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7699
2022-09-23 08:47:34 -04:00
Brad King
87b9a31489 Merge topic 'modernize-build-self'
9629be8080 Build: Use `CMAKE_CURRENT_XXX_DIR` instead of top dirs
e6fb5a1feb Build: Sort linked libraries list of `CMakeLib`
aa7290e8dc Build: Use imported target `Threads::Threads` instead of variable
df8ad72ffa Build: Use imported target `kwiml::kwiml` instead of variables
eeebf31e54 Build: Use imported target `LibRHash::LibRHash` instead of variables
08be01a181 Build: Use imported target `LibUV::LibUV` instead of variables
ddac6dcbe8 Build: Use imported target `JsonCpp::JsonCpp` instead of variables
ac76c53d33 Build: Use imported target `CURL::libcurl` instead of variables
...

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7570
2022-09-23 08:46:08 -04:00
Brad King
4281f6ac34 Merge topic 'cdo-consider-dots'
df377a22dd CMakeDependentOption: allow in depends the use of .

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7701
2022-09-23 08:45:11 -04:00