From c9f0e8a551778e185b1fb92f2bb07d8cc3581f95 Mon Sep 17 00:00:00 2001
From: OpportunityLiu <opportunity@live.in>
Date: Thu, 18 Jul 2019 10:04:03 +0800
Subject: rename file; support cuda build selected file

---
 xmake/plugins/project/vsxmake/vsproj/Xmake.props            | 12 ++++++------
 xmake/plugins/project/vsxmake/vsproj/Xmake.targets          |  9 ++++++++-
 .../project/vsxmake/vsproj/templates/Xmake.Custom.files     | 11 -----------
 .../vsxmake/vsproj/templates/Xmake.Custom.files.filters     | 13 -------------
 .../project/vsxmake/vsproj/templates/Xmake.Custom.items     | 11 +++++++++++
 .../vsxmake/vsproj/templates/Xmake.Custom.items.filters     | 13 +++++++++++++
 .../templates/vcxproj.filters/#target#.vcxproj.filters      |  4 ++--
 xmake/plugins/project/vsxmake/vsxmake.lua                   |  8 ++++----
 8 files changed, 44 insertions(+), 37 deletions(-)
 delete mode 100644 xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.files
 delete mode 100644 xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.files.filters
 create mode 100644 xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items
 create mode 100644 xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items.filters

diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.props b/xmake/plugins/project/vsxmake/vsproj/Xmake.props
index ac84bf1d7..e954a435b 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.props
+++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.props
@@ -145,14 +145,14 @@
       Include="$(MSBuildProjectDirectory)\Xmake.Custom.props" />
     <None Condition="Exists('$(MSBuildProjectDirectory)\Xmake.Custom.targets')"
       Include="$(MSBuildProjectDirectory)\Xmake.Custom.targets" />
-    <None Condition="Exists('$(MSBuildProjectDirectory)\Xmake.Custom.files')"
-      Include="$(MSBuildProjectDirectory)\Xmake.Custom.files" />
-    <None Condition="Exists('$(MSBuildProjectDirectory)\Xmake.Custom.files.filters')"
-      Include="$(MSBuildProjectDirectory)\Xmake.Custom.files.filters" />
+    <None Condition="Exists('$(MSBuildProjectDirectory)\Xmake.Custom.items')"
+      Include="$(MSBuildProjectDirectory)\Xmake.Custom.items" />
+    <None Condition="Exists('$(MSBuildProjectDirectory)\Xmake.Custom.items.filters')"
+      Include="$(MSBuildProjectDirectory)\Xmake.Custom.items.filters" />
     <None Condition="'$(XmakeScriptDir)' != '$(XmakeProjectDir)' And Exists('$(XmakeScriptDir)\xmake.lua')"
       Include="$(XmakeScriptDir)\xmake.lua" />
   </ItemGroup>
   
-  <Import Condition="Exists('$(MSBuildProjectDirectory)\Xmake.Custom.files')"
-    Project="$(MSBuildProjectDirectory)\Xmake.Custom.files" />
+  <Import Condition="Exists('$(MSBuildProjectDirectory)\Xmake.Custom.items')"
+    Project="$(MSBuildProjectDirectory)\Xmake.Custom.items" />
 </Project>
diff --git a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
index 940490271..0f4b287f5 100644
--- a/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
+++ b/xmake/plugins/project/vsxmake/vsproj/Xmake.targets
@@ -139,6 +139,7 @@ MSBuild Properties:
     PreprocessorDefinitions: %(ClCompile.PreprocessorDefinitions)
     LanguageStandard: %(ClCompile.LanguageStandard)
     SelectedFiles: $(SelectedFiles)
+    VCTargetsPath: $(VCTargetsPath)
     " Importance="High" />
   </Target>
 
@@ -177,12 +178,18 @@ MSBuild Properties:
 
   <Target Name="BeforeBuildFiles" />
   <Target Name="AfterBuildFiles" />
-  <Target Name="ClCompile">
+  <Target Name="BuildFiles" Condition="'$(DesignTimeBuild)' != 'true'">
     <CallTarget Targets="Show" Condition="$(XmakeDiagnosis)" />
     <CallTarget Targets="BeforeBuildFiles" />
     <CallTarget Targets="_XmakeConfig;_XmakeBuildFile" />
     <CallTarget Targets="AfterBuildFiles" />
   </Target>
+  <Target Name="ClCompile">
+    <CallTarget Targets="BuildFiles" />
+  </Target>
+  <Target Name="CudaBuild">
+    <CallTarget Targets="BuildFiles" />
+  </Target>
 
   <ImportGroup Label="CustomTargets">
     <!--only search 2 levels to avoid accidentally import-->
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.files b/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.files
deleted file mode 100644
index a894e8d0d..000000000
--- a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.files
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    Use this file to include custom files for visual studio projects.
-
-    This file will be imported by .vcxproj
-   -->
-  <ItemGroup>
-    <!-- <None Include="$(XmakeProjectDir)\xxx\yyy\zzz" /> -->
-  </ItemGroup>
-</Project>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.files.filters b/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.files.filters
deleted file mode 100644
index f69e1abb7..000000000
--- a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.files.filters
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <!--
-    Use this file to include custom files for visual studio projects.
-
-    This file will be imported by .vcxproj.filters
-   -->
-  <ItemGroup>
-    <!-- <None Include="$(XmakeProjectDir)\xxx\yyy\zzz">
-      <Filter>xxx\yyy</Filter>
-    </None> -->
-  </ItemGroup>
-</Project>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items b/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items
new file mode 100644
index 000000000..a894e8d0d
--- /dev/null
+++ b/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    Use this file to include custom files for visual studio projects.
+
+    This file will be imported by .vcxproj
+   -->
+  <ItemGroup>
+    <!-- <None Include="$(XmakeProjectDir)\xxx\yyy\zzz" /> -->
+  </ItemGroup>
+</Project>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items.filters b/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items.filters
new file mode 100644
index 000000000..f69e1abb7
--- /dev/null
+++ b/xmake/plugins/project/vsxmake/vsproj/templates/Xmake.Custom.items.filters
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!--
+    Use this file to include custom files for visual studio projects.
+
+    This file will be imported by .vcxproj.filters
+   -->
+  <ItemGroup>
+    <!-- <None Include="$(XmakeProjectDir)\xxx\yyy\zzz">
+      <Filter>xxx\yyy</Filter>
+    </None> -->
+  </ItemGroup>
+</Project>
diff --git a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/#target#.vcxproj.filters b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/#target#.vcxproj.filters
index 80a13f280..ce686b448 100644
--- a/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/#target#.vcxproj.filters
+++ b/xmake/plugins/project/vsxmake/vsproj/templates/vcxproj.filters/#target#.vcxproj.filters
@@ -21,10 +21,10 @@
     <None Include="$(MSBuildProjectDirectory)\Xmake.Custom.targets">
       <Filter>Properties</Filter>
     </None>
-    <None Include="$(MSBuildProjectDirectory)\Xmake.Custom.files">
+    <None Include="$(MSBuildProjectDirectory)\Xmake.Custom.items">
       <Filter>Properties</Filter>
     </None>
-    <None Include="$(MSBuildProjectDirectory)\Xmake.Custom.files.filters">
+    <None Include="$(MSBuildProjectDirectory)\Xmake.Custom.items.filters">
       <Filter>Properties</Filter>
     </None>
     <None Include="$(XmakeScriptDir)\xmake.lua">
diff --git a/xmake/plugins/project/vsxmake/vsxmake.lua b/xmake/plugins/project/vsxmake/vsxmake.lua
index 6fe5bce24..ac9e27c85 100644
--- a/xmake/plugins/project/vsxmake/vsxmake.lua
+++ b/xmake/plugins/project/vsxmake/vsxmake.lua
@@ -32,8 +32,8 @@ local template_fil = path.join(template_root, "vcxproj.filters", "#target#.vcxpr
 local template_usr = path.join(template_root, "#target#.vcxproj.user")
 local template_props = path.join(template_root, "Xmake.Custom.props")
 local template_targets = path.join(template_root, "Xmake.Custom.targets")
-local template_files = path.join(template_root, "Xmake.Custom.files")
-local template_filefil = path.join(template_root, "Xmake.Custom.files.filters")
+local template_items = path.join(template_root, "Xmake.Custom.items")
+local template_itemfil = path.join(template_root, "Xmake.Custom.items.filters")
 
 function _filter_files(files, exts)
     local extset = hashset.from(exts)
@@ -160,8 +160,8 @@ function make(version)
             -- add project custom file
             _trycp(template_props, proj_dir)
             _trycp(template_targets, proj_dir)
-            _trycp(template_files, proj_dir)
-            _trycp(template_filefil, proj_dir)
+            _trycp(template_items, proj_dir)
+            _trycp(template_itemfil, proj_dir)
             -- add project user file
             _trycp(template_usr, proj_dir, target .. ".vcxproj.user")
         end
-- 
cgit v1.3.1