Commit Graph

33026 Commits

Author SHA1 Message Date
Kitware Robot
f2a4d7b2c3 CMake Nightly Date Stamp 2022-10-05 00:01:12 -04:00
Brad King
7bea75f1fa Merge topic 'try_compile-rename-source_from_arg'
0f28653ba9 try_compile: Rename SOURCE_FROM_ARG -> SOURCE_FROM_CONTENT

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7733
2022-10-04 10:26:34 -04:00
Kitware Robot
a3252ac53e CMake Nightly Date Stamp 2022-10-04 00:01:15 -04:00
Brad King
42c0428e5f Merge topic 'ci-xcode-14.0'
9cdf4c9be4 gitlab-ci: update macOS jobs to use Xcode 14.0
5d2c2b2558 Tests: Update RunCMake.XcodeProject iOS cases for Xcode 14.0
12c6fec6b4 Xcode: Drop CMAKE_INTDIR= definition in Swift targets

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7732
2022-10-03 10:31:27 -04:00
Kitware Robot
6533383134 CMake Nightly Date Stamp 2022-10-03 00:01:15 -04:00
Kitware Robot
8251cdfe39 CMake Nightly Date Stamp 2022-10-02 00:01:11 -04:00
Kitware Robot
89965c855d CMake Nightly Date Stamp 2022-10-01 00:01:16 -04:00
Matthew Woehlke
0f28653ba9 try_compile: Rename SOURCE_FROM_ARG -> SOURCE_FROM_CONTENT
Change the SOURCE_FROM_ARG keyword to try_compile to SOURCE_FROM_CONTENT
(which we can do because it was recently added and hasn't been in a
release yet). The new name should be clearer as to what it does, and
also more consistent with the CONTENT arguments to some other commands.

Also, fix a typo in an error message.
2022-09-30 14:50:25 -04:00
Brad King
12c6fec6b4 Xcode: Drop CMAKE_INTDIR= definition in Swift targets
Xcode 14.0 warns that Swift doesn't support definition values.
Therefore `CMAKE_INTDIR` is not useful to Swift sources.  Drop it.
2022-09-30 13:08:05 -04:00
Brad King
c7170651f4 Merge topic 'xcode-build-layout'
d0a6ebf57b Xcode: Fix "clean" operation under the "new build system"
dc5fc898f6 Xcode: Set object file locations using TARGET_TEMP_DIR
a7fb4bc475 Xcode: Set build product locations using CONFIGURATION_BUILD_DIR
6883b82124 cmGlobalXCodeGenerator: Remove unused local variable settings

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7730
2022-09-30 07:24:48 -04:00
Kitware Robot
f6fe3a40f2 CMake Nightly Date Stamp 2022-09-30 00:01:12 -04:00
Brad King
d0a6ebf57b Xcode: Fix "clean" operation under the "new build system"
Previously we set `SYMROOT` to tell Xcode where to place the build
products.  However, the "clean" operation in the Xcode "new build
system" expects that only Xcode creates the `SYMROOT` directory or
contents inside it.  Since we create that directory, "clean" fails.

We now explicitly set `CONFIGURATION_BUILD_DIR` and `TARGET_TEMP_DIR`
instead of letting Xcode compute their values from `SYMROOT`, so we no
longer need to set the latter.  Drop the now-unnecessary `SYMROOT`.

Fixes: #22550
2022-09-29 15:04:08 -04:00
Brad King
dc5fc898f6 Xcode: Set object file locations using TARGET_TEMP_DIR
This avoids relying on `SYMROOT` to locate the object files.

Issue: #22550
2022-09-29 15:04:07 -04:00
Brad King
a7fb4bc475 Xcode: Set build product locations using CONFIGURATION_BUILD_DIR
Since commit 59a2265576 (Xcode: Use EFFECTIVE_PLATFORM_NAME reference in
ComputeOutputDir, 2011-08-12, v2.8.6~43^2~1) we can now set the build
products path using `CONFIGURATION_BUILD_DIR` unconditionally because we
compute the correct value even when using `EFFECTIVE_PLATFORM_NAME`.
This avoids relying on `SYMROOT` to locate the build products.

Issue: #22550
2022-09-29 15:03:37 -04:00
Brad King
6883b82124 cmGlobalXCodeGenerator: Remove unused local variable settings 2022-09-29 14:26:51 -04:00
Brad King
cadcb6a5f0 Merge topic 'try_compile-no-cache'
09b3051524 try_compile: Add NO_CACHE option (also try_run)

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7723
2022-09-29 07:59:02 -04:00
Kitware Robot
0fb136c1a6 CMake Nightly Date Stamp 2022-09-29 00:01:14 -04:00
Matthew Woehlke
09b3051524 try_compile: Add NO_CACHE option (also try_run)
Add NO_CACHE option to try_compile and try_run, which places the results
in regular, rather than cache, variables.

Issue: #22799
2022-09-28 13:41:11 -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
Kitware Robot
17250fe2c9 CMake Nightly Date Stamp 2022-09-28 00:01:18 -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
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
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
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
Kitware Robot
97cf5a0407 CMake Nightly Date Stamp 2022-09-27 00:01:11 -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
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
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
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
3a1db0f3ad Merge topic 'try_run-no-project'
aac542f2f1 try_run: Remove PROJECT support

Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: buildbot <buildbot@kitware.com>
Merge-request: !7702
2022-09-23 08:44:23 -04:00
Brad King
ba770994af Merge topic 'genex-LINK_LIBRARY-framework-with-postfix'
0bd3efffbc Genex LINK_LIBRARY: Add support for framework with postfix

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !7691
2022-09-23 08:43:31 -04:00
Kitware Robot
9518b42f37 CMake Nightly Date Stamp 2022-09-23 00:01:09 -04:00
zhenhaonong
1b64aa68b9 cmSystemTools: Fix encoding of whole-environment lookup on Windows
On Windows, `environ` is encoded by `CP_ACP`, which may be different
from `KWSYS_ENCODING_DEFAULT_CODEPAGE`.  When environment variables
include a unicode character, they may be corrupted.  Use `_wenviron`
instead.
2022-09-23 11:54:24 +08:00
Matthew Woehlke
611d801790 try_compile: Add SOURCE_FROM_FILE
Add ability to copy try_compile (and try_run) source files from
arbitrary locations into the operation directory. This is included for
the sake of completion and consolidation, although use cases which
actually require this may be rare.
2022-09-22 14:56:50 -04:00
Matthew Woehlke
cb14ae2b87 try_compile: Add SOURCE_FROM_{ARG,VAR}
Add ability to "feed" try_compile (and try_run) sources more directly,
either from literal content, or from a CMake variable which contains
literal content. This saves the user from needing a separate step to
write the content to a file, and allows for the sources to only exist in
the scratch directory.
2022-09-22 13:33:27 -04:00
elksson
2d54d6f395 VS: Fix PACKAGE target build with SDK-style projects
Extend the fix from commit a450cc9533 (VS: Set ResolveNugetPackages to
false for ALL_BUILD and ZERO_CHECK, 2021-12-15, v3.23.0-rc1~196^2~1) to
the `PACKAGE` target too.
2022-09-22 10:52:33 -04:00
Alex Turbov
9629be8080 Build: Use CMAKE_CURRENT_XXX_DIR instead of top dirs 2022-09-22 10:21:39 -04:00