Use property variable to reference C# Thrift project dynamically in CMake build system.

Author: mcserep

plugins/csharp/parser/src_csharp/CMakeLists.txt

@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.5.1)
 project(CodeCompassCSharp)
 
 add_custom_target(dotnetbuild ALL
-COMMAND dotnet build -r linux-x64 -o ${CMAKE_CURRENT_BINARY_DIR}/csharp
+COMMAND dotnet build -o ${CMAKE_CURRENT_BINARY_DIR}/csharp
 WORKING_DIRECTORY "${PROJECT_SOURCE_DIR}"
 )
 

plugins/csharp/parser/src_csharp/CSharpParser.csproj

@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\model\*.cs" />
-    <Compile Include="..\..\migrations\*.cs" />
+    <Compile Include="../../model/*.cs" />
+    <Compile Include="../../migrations/*.cs" />
   </ItemGroup>
 
   <ItemGroup>

plugins/csharp/service/src_csharp/CMakeLists.txt

@@ -16,22 +16,15 @@ add_custom_target(dotnetaddclasslib
 
 add_dependencies(dotnetaddclasslib dotnetbuildservice)
 
-add_custom_target(dotnetaddref
-  COMMAND dotnet add reference ${CMAKE_CURRENT_BINARY_DIR}/gen-netstd/gen-netstd.csproj
-  WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-)
-
-add_dependencies(dotnetaddref dotnetaddclasslib)
-
 add_custom_target(dotnetaddthriftlib
   COMMAND dotnet add package ApacheThrift --version 0.16.0
   WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/gen-netstd/"
 )
 
-add_dependencies(dotnetaddthriftlib dotnetaddref)
+add_dependencies(dotnetaddthriftlib dotnetaddclasslib)
 
 add_custom_target(dotnetbuildfiles ALL
-  COMMAND dotnet build -o ${CMAKE_CURRENT_BINARY_DIR}/csharpservice
+  COMMAND dotnet build -o ${CMAKE_CURRENT_BINARY_DIR}/csharpservice -p:BuildDir=${CMAKE_CURRENT_BINARY_DIR}
   WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
 )
 

plugins/csharp/service/src_csharp/csharpservice.csproj

@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\model\*.cs" />
+    <Compile Include="../../model/*.cs" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\build_pgsql\plugins\csharp\service\src_csharp\gen-netstd\gen-netstd.csproj" />
+    <ProjectReference Include="$(BuildDir)/gen-netstd/gen-netstd.csproj" />
   </ItemGroup>
 
   <ItemGroup>