mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-20 14:10:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

VS: Fix Deploy content in .csproj files

Browse Source
This commit is contained in:
Wil Stark
2018-12-06 12:04:41 -08:00
parent 81bea69bd1
commit b5b63da088
4 changed files with 96 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Source/cmVisualStudio10TargetGenerator.cxx
View File

@@ -1680,6 +1680,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(Elem& e1,
subType = "Designer"; subType = "Designer";
} }
if (const char* c = sf->GetProperty("VS_COPY_TO_OUT_DIR")) { if (const char* c = sf->GetProperty("VS_COPY_TO_OUT_DIR")) {
tool = "Content";
copyToOutDir = c; copyToOutDir = c;
toolHasSettings = true; toolHasSettings = true;
} }

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

@@ -12,5 +12,6 @@ run_cmake(VsDebuggerEnvironment)
run_cmake(VsCSharpCustomTags) run_cmake(VsCSharpCustomTags)
run_cmake(VsCSharpReferenceProps) run_cmake(VsCSharpReferenceProps)
run_cmake(VsCSharpWithoutSources) run_cmake(VsCSharpWithoutSources)
run_cmake(VsCSharpDeployFiles)
run_cmake(VsSdkDirectories) run_cmake(VsSdkDirectories)
run_cmake(VsGlobals) run_cmake(VsGlobals)

67
Tests/RunCMake/VS10Project/VsCSharpDeployFiles-check.cmake Normal file
View File

@@ -0,0 +1,67 @@
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(inNode1 FALSE)
set(foundNode1 FALSE)
set(foundCopyDirective1 FALSE)
set(inNode2 FALSE)
set(foundNode2 FALSE)
set(foundCopyDirective2 FALSE)
set(foundNode3 FALSE)
file(STRINGS "${csProjectFile}" lines)
foreach(line IN LISTS lines)
if( inNode1 )
if(line MATCHES " *<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> *$")
set(foundCopyDirective1 TRUE)
elseif( line MATCHES " *</Content> *$")
set(inNode1 FALSE)
endif()
elseif( inNode2 )
if(line MATCHES " *<CopyToOutputDirectory>Always</CopyToOutputDirectory> *$")
set(foundCopyDirective2 TRUE)
elseif( line MATCHES " *</Content> *$")
set(inNode2 FALSE)
endif()
elseif(line MATCHES "^ *<Content *Include *= *\".*content1\\.txt\"> *")
set(foundNode1 TRUE)
set(inNode1 TRUE)
elseif(line MATCHES "^ *<Content *Include *= *\".*content2\\.txt\"> *")
set(foundNode2 TRUE)
set(inNode2 TRUE)
elseif(line MATCHES "^ *<None *Include *= *\".*content3\\.txt\"> *")
set(foundNode3 TRUE)
endif()
endforeach()
if(NOT foundNode1)
set(RunCMake_TEST_FAILED "Did not find <Content> item content1.txt.")
return()
endif()
if(NOT foundCopyDirective1)
set(RunCMake_TEST_FAILED "Did not find PreserveNewest for <Content> item content1.txt.")
return()
endif()
if(NOT foundNode2)
set(RunCMake_TEST_FAILED "Did not find <Content> item content2.txt.")
return()
endif()
if(NOT foundCopyDirective2)
set(RunCMake_TEST_FAILED "Did not find Always for <Content> item content2.txt.")
return()
endif()
if(NOT foundNode3)
set(RunCMake_TEST_FAILED "Did not find <None> item content3.txt.")
return()
endif()

27
Tests/RunCMake/VS10Project/VsCSharpDeployFiles.cmake Normal file
View File

@@ -0,0 +1,27 @@
enable_language(CSharp)
set(fileNames
"${CMAKE_CURRENT_BINARY_DIR}/content1.txt"
"${CMAKE_CURRENT_BINARY_DIR}/content2.txt"
"${CMAKE_CURRENT_BINARY_DIR}/content3.txt")
foreach(f ${fileNames})
message(STATUS "touch ${f}")
file(TOUCH ${f})
endforeach()
set_source_files_properties( "${CMAKE_CURRENT_BINARY_DIR}/content1.txt"
PROPERTIES
VS_COPY_TO_OUT_DIR PreserveNewest
)
set_source_files_properties( "${CMAKE_CURRENT_BINARY_DIR}/content2.txt"
PROPERTIES
VS_COPY_TO_OUT_DIR Always
)
add_library(foo SHARED
foo.cs
${fileNames}
)