diff options
4 files changed, 96 insertions, 0 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 7d7defc..e4ee184 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -1680,6 +1680,7 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(Elem& e1, subType = "Designer"; } if (const char* c = sf->GetProperty("VS_COPY_TO_OUT_DIR")) { + tool = "Content"; copyToOutDir = c; toolHasSettings = true; } diff --git a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake index 4bfb2f2..db375ae 100644 --- a/Tests/RunCMake/VS10Project/RunCMakeTest.cmake +++ b/Tests/RunCMake/VS10Project/RunCMakeTest.cmake @@ -12,5 +12,6 @@ run_cmake(VsDebuggerEnvironment) run_cmake(VsCSharpCustomTags) run_cmake(VsCSharpReferenceProps) run_cmake(VsCSharpWithoutSources) +run_cmake(VsCSharpDeployFiles) run_cmake(VsSdkDirectories) run_cmake(VsGlobals) diff --git a/Tests/RunCMake/VS10Project/VsCSharpDeployFiles-check.cmake b/Tests/RunCMake/VS10Project/VsCSharpDeployFiles-check.cmake new file mode 100644 index 0000000..c29f2ae --- /dev/null +++ b/Tests/RunCMake/VS10Project/VsCSharpDeployFiles-check.cmake @@ -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() diff --git a/Tests/RunCMake/VS10Project/VsCSharpDeployFiles.cmake b/Tests/RunCMake/VS10Project/VsCSharpDeployFiles.cmake new file mode 100644 index 0000000..cb77fa7 --- /dev/null +++ b/Tests/RunCMake/VS10Project/VsCSharpDeployFiles.cmake @@ -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} +) |