summaryrefslogtreecommitdiffstats
path: root/Tests/FindPython/Python2Embedded
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-11-23 12:09:01 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-11-23 12:09:09 (GMT)
commit90907c8ff96ff07f0dafc1f4904d25b1e10f014b (patch)
tree2a83f7f51b031e917c71e377ac8e6d9891148ac6 /Tests/FindPython/Python2Embedded
parent3bb47e43f0c3c7fc0240aa6ffdbc6748b01b05ea (diff)
parent80fc564dd7cbebc374a18fb57c71472dac5de6c1 (diff)
downloadCMake-90907c8ff96ff07f0dafc1f4904d25b1e10f014b.zip
CMake-90907c8ff96ff07f0dafc1f4904d25b1e10f014b.tar.gz
CMake-90907c8ff96ff07f0dafc1f4904d25b1e10f014b.tar.bz2
Merge topic 'try_compile-copy-config' into release-3.25
80fc564dd7 try_compile: Restore COPY_FILE with CMAKE_TRY_COMPILE_CONFIGURATION Acked-by: Kitware Robot <kwrobot@kitware.com> Tested-by: buildbot <buildbot@kitware.com> Acked-by: Robert Maynard <robertjmaynard@gmail.com> Merge-request: !7948
Diffstat (limited to 'Tests/FindPython/Python2Embedded')
0 files changed, 0 insertions, 0 deletions
generated by cgit v0.12 at 2026-03-26 08:44:17 (GMT)
class='upd'>Source/cmFileCommand.cxx7
-rw-r--r--Source/cmFindLibraryCommand.cxx2
-rw-r--r--Source/cmGeneratorExpressionEvaluationFile.cxx6
-rw-r--r--Source/cmGeneratorExpressionNode.cxx3
-rw-r--r--Source/cmGeneratorTarget.cxx11
-rw-r--r--Source/cmGetCMakePropertyCommand.cxx3
-rw-r--r--Source/cmGetDirectoryPropertyCommand.cxx2
-rw-r--r--Source/cmGetPropertyCommand.cxx3
-rw-r--r--Source/cmIncludeCommand.cxx3
-rw-r--r--Source/cmInstallCommand.cxx32
-rw-r--r--Source/cmInstallFilesCommand.cxx5
-rw-r--r--Source/cmInstallProgramsCommand.cxx5
-rw-r--r--Source/cmInstallTargetGenerator.cxx6
-rw-r--r--Source/cmInstallTargetsCommand.cxx5
-rw-r--r--Source/cmMakefile.cxx80
-rw-r--r--Source/cmMakefile.h1
-rw-r--r--Source/cmQtAutoGenerators.cxx7
-rw-r--r--Source/cmSetPropertyCommand.cxx3
-rw-r--r--Source/cmSourceFile.cxx2
-rw-r--r--Source/cmSourceFileLocation.cxx3
-rw-r--r--Source/cmTarget.cxx18
29 files changed, 97 insertions, 139 deletions
diff --git a/Source/cmBuildCommand.cxx b/Source/cmBuildCommand.cxx
index cdca792..988e9a7 100644
--- a/Source/cmBuildCommand.cxx
+++ b/Source/cmBuildCommand.cxx
@@ -105,9 +105,8 @@ bool cmBuildCommand
"Ignoring PROJECT_NAME option because it has no effect.");
}
- std::string makecommand = this->Makefile->GetLocalGenerator()
- ->GetGlobalGenerator()->GenerateCMakeBuildCommand(target, configuration,
- "", true);
+ std::string makecommand = this->Makefile->GetGlobalGenerator()
+ ->GenerateCMakeBuildCommand(target, configuration, "", true);
this->Makefile->AddDefinition(variable, makecommand.c_str());
@@ -135,9 +134,8 @@ bool cmBuildCommand
configType = cfg;
}
- std::string makecommand = this->Makefile->GetLocalGenerator()
- ->GetGlobalGenerator()->GenerateCMakeBuildCommand("", configType,
- "", true);
+ std::string makecommand = this->Makefile->GetGlobalGenerator()
+ ->GenerateCMakeBuildCommand("", configType, "", true);
if(cacheValue)
{
diff --git a/Source/cmComputeLinkDepends.cxx b/Source/cmComputeLinkDepends.cxx