mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'vs-output-name-net-sdk'

Browse Source 
66bd326e28 VS: Use OUTPUT_NAME in DOTNET_SDK projects

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9808
This commit is contained in:
Brad King
2024-09-12 12:12:37 +00:00
committed by Kitware Robot
parent b91ea1b368 66bd326e28
commit d3518bbb17
5 changed files with 49 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -1004,6 +1004,8 @@ void cmVisualStudio10TargetGenerator::WriteSdkStyleProjectFile(
ConvertToWindowsSlash(outDir);
e1.Element("OutputPath", outDir);
e1.Element("AssemblyName", GetAssemblyName(config));
Options& o = *(this->ClOptions[config]);
OptionsHelper oh(o, e1);
oh.OutputFlagMap();
@@ -1609,13 +1611,7 @@ void cmVisualStudio10TargetGenerator::WriteMSToolConfigurationValuesManaged(
this->WriteMSToolConfigurationValuesCommon(e1, config);
std::string postfixName =
cmStrCat(cmSystemTools::UpperCase(config), "_POSTFIX");
std::string assemblyName = this->GeneratorTarget->GetOutputName(
config, cmStateEnums::RuntimeBinaryArtifact);
if (cmValue postfix = this->GeneratorTarget->GetProperty(postfixName)) {
assemblyName += *postfix;
}
std::string assemblyName = GetAssemblyName(config);
e1.Element("AssemblyName", assemblyName);
if (cmStateEnums::EXECUTABLE == this->GeneratorTarget->GetType()) {
@@ -3274,6 +3270,19 @@ std::string cmVisualStudio10TargetGenerator::GetTargetOutputName() const
return cmStrCat(nameComponents.prefix, nameComponents.base);
}
std::string cmVisualStudio10TargetGenerator::GetAssemblyName(
std::string const& config) const
{
std::string postfixName =
cmStrCat(cmSystemTools::UpperCase(config), "_POSTFIX");
std::string assemblyName = this->GeneratorTarget->GetOutputName(
config, cmStateEnums::RuntimeBinaryArtifact);
if (cmValue postfix = this->GeneratorTarget->GetProperty(postfixName)) {
assemblyName += *postfix;
}
return assemblyName;
}
bool cmVisualStudio10TargetGenerator::ComputeClOptions()
{
return std::all_of(

1
Source/cmVisualStudio10TargetGenerator.h
View File

@@ -122,6 +122,7 @@ private:
std::vector<std::string> GetIncludes(std::string const& config,
std::string const& lang) const;
std::string GetTargetOutputName() const;
std::string GetAssemblyName(std::string const& config) const;
bool ComputeClOptions();
bool ComputeClOptions(std::string const& configName);

1
Tests/RunCMake/VsDotnetSdk/RunCMakeTest.cmake
View File

@@ -6,6 +6,7 @@ run_cmake(VsDotnetSdkStartupObject)
run_cmake(VsDotnetSdkDefines)
run_cmake(DotnetSdkVariables)
run_cmake(VsDotnetSdkXamlFiles)
run_cmake(VsDotnetSdkAssemblyName)
function(run_VsDotnetSdk)
set(RunCMake_TEST_BINARY_DIR ${RunCMake_BINARY_DIR}/VsDotnetSdk-build)

22
Tests/RunCMake/VsDotnetSdk/VsDotnetSdkAssemblyName-check.cmake Normal file
View File

@@ -0,0 +1,22 @@
set(csProjectFile ${RunCMake_TEST_BINARY_DIR}/foo.csproj)
if(NOT EXISTS "${csProjectFile}")
set(RunCMake_TEST_FAILED "Project file ${csProjectFile} does not exist.")
return()
endif()
set(hasAssemblyName FALSE)
file(STRINGS "${csProjectFile}" lines)
foreach(line IN LISTS lines)
if(NOT inLib1)
if(line MATCHES "<AssemblyName>longer name</AssemblyName>")
set(hasAssemblyName TRUE)
endif()
endif()
endforeach()
if(NOT hasAssemblyName)
set(RunCMake_TEST_FAILED "<AssemblyName> not found in ${csProjectFile}.")
endif()

9
Tests/RunCMake/VsDotnetSdk/VsDotnetSdkAssemblyName.cmake Normal file
View File

@@ -0,0 +1,9 @@
enable_language(CSharp)
if(NOT CMAKE_CSharp_COMPILER)
return()
endif()
set(CMAKE_DOTNET_SDK "Microsoft.NET.Sdk")
add_library(foo SHARED lib1.cs)
set_target_properties(foo PROPERTIES OUTPUT_NAME "longer name")