Skip to content
Snippets Groups Projects
Commit 194e2c45 authored by Tim Übelhör's avatar Tim Übelhör
Browse files

Removed protocol submodule instead generate new code on build system.

Successcful build with grpc & boost from vcpkg
parent 6923946c
No related branches found
No related tags found
No related merge requests found
[submodule "FMU-Core"]
path = FMU-Core
url = https://tim.uebelhoer@git.rwth-aachen.de/ModeliChart/FMU-Core.git
[submodule "ModeliProtocol"]
path = ModeliProtocol
url = git@git.rwth-aachen.de:ModeliChart/ModeliProtocol.git
......@@ -74,27 +74,27 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<SourcePath>$(SourcePath)</SourcePath>
<IncludePath>C:\IncludeLinux\c++\4.8;C:\boost_1_65_1;$(IncludePath)</IncludePath>
<IncludePath>$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
<SourcePath>$(SourcePath)</SourcePath>
<IncludePath>C:\IncludeLinux\c++\4.8;C:\boost_1_65_1;$(IncludePath)</IncludePath>
<IncludePath>$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<SourcePath>$(SourcePath)</SourcePath>
<IncludePath>C:\IncludeLinux\c++\4.8;C:\boost_1_65_1;$(IncludePath)</IncludePath>
<IncludePath>$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<SourcePath>$(SourcePath)</SourcePath>
<IncludePath>C:\IncludeLinux\c++\4.8;C:\boost_1_65_1;$(IncludePath)</IncludePath>
<IncludePath>$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x86'">
<SourcePath>$(SourcePath)</SourcePath>
<IncludePath>C:\IncludeLinux\c++\4.8;C:\boost_1_65_1;$(IncludePath)</IncludePath>
<IncludePath>$(IncludePath)</IncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x86'">
<SourcePath>$(SourcePath)</SourcePath>
<IncludePath>C:\IncludeLinux\c++\4.8;C:\boost_1_65_1;$(IncludePath)</IncludePath>
<IncludePath>$(IncludePath)</IncludePath>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<Link>
......
......@@ -101,14 +101,15 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\Users\alldocube\Documents\GitRepo\grpc\third_party\protobuf\src;C:\Users\alldocube\Documents\GitRepo\grpc\include;C:\boost_1_65_1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB -D_WIN32_WINNT=0x0A00 %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp14</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>Winmm.lib;gpr.lib;grpc.lib;grpc_unsecure.lib;grpc++.lib;grpc++_unsecure.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>C:\boost_1_65_1\stage\lib;C:\Users\alldocube\Documents\GitRepo\grpc\.build\third_party\protobuf;C:\Users\alldocube\Documents\GitRepo\grpc\.build</AdditionalLibraryDirectories>
<AdditionalDependencies>Winmm.lib;ws2_32.lib;gpr.lib;grpc.lib;grpc++.lib;grpc_unsecure.lib;grpc++_unsecure.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
......@@ -117,14 +118,15 @@
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
<PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\Users\alldocube\Documents\GitRepo\grpc\third_party\protobuf\src;C:\Users\alldocube\Documents\GitRepo\grpc\include;C:\boost_1_65_1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB -D_WIN32_WINNT=0x0A00 %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp14</LanguageStandard>
</ClCompile>
<Link>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>Winmm.lib;gpr.lib;grpc.lib;grpc_unsecure.lib;grpc++.lib;grpc++_unsecure.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>C:\boost_1_65_1\stage\lib;C:\Users\alldocube\Documents\GitRepo\grpc\.build\third_party\protobuf;C:\Users\alldocube\Documents\GitRepo\grpc\.build</AdditionalLibraryDirectories>
<AdditionalDependencies>Winmm.lib;ws2_32.lib;gpr.lib;grpc.lib;grpc++.lib;grpc_unsecure.lib;grpc++_unsecure.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
......@@ -135,7 +137,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\Users\alldocube\Documents\GitRepo\grpc\third_party\protobuf\src;C:\Users\alldocube\Documents\GitRepo\grpc\include;C:\boost_1_65_1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB -D_WIN32_WINNT=0x0A00 %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp14</LanguageStandard>
</ClCompile>
......@@ -143,8 +145,9 @@
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>Winmm.lib;gpr.lib;grpc.lib;grpc_unsecure.lib;grpc++.lib;grpc++_unsecure.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>C:\boost_1_65_1\stage\lib;C:\Users\alldocube\Documents\GitRepo\grpc\.build\third_party\protobuf;C:\Users\alldocube\Documents\GitRepo\grpc\.build</AdditionalLibraryDirectories>
<AdditionalDependencies>Winmm.lib;ws2_32.lib;gpr.lib;grpc.lib;grpc++.lib;grpc_unsecure.lib;grpc++_unsecure.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
......@@ -155,7 +158,7 @@
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<PreprocessorDefinitions>NDEBUG;_CONSOLE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<AdditionalIncludeDirectories>C:\Users\alldocube\Documents\GitRepo\grpc\third_party\protobuf\src;C:\Users\alldocube\Documents\GitRepo\grpc\include;C:\boost_1_65_1;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalOptions>-DBOOST_DATE_TIME_NO_LIB -DBOOST_REGEX_NO_LIB -D_WIN32_WINNT=0x0A00 %(AdditionalOptions)</AdditionalOptions>
<LanguageStandard>stdcpp14</LanguageStandard>
</ClCompile>
......@@ -163,8 +166,9 @@
<SubSystem>Console</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>Winmm.lib;gpr.lib;grpc.lib;grpc_unsecure.lib;grpc++.lib;grpc++_unsecure.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>C:\boost_1_65_1\stage\lib;C:\Users\alldocube\Documents\GitRepo\grpc\.build\third_party\protobuf;C:\Users\alldocube\Documents\GitRepo\grpc\.build</AdditionalLibraryDirectories>
<AdditionalDependencies>Winmm.lib;ws2_32.lib;gpr.lib;grpc.lib;grpc++.lib;grpc_unsecure.lib;grpc++_unsecure.lib;libprotobuf.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
......@@ -182,7 +186,17 @@
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\grpc.cpp.redist.1.0.1\build\native\grpc.cpp.redist.targets" Condition="Exists('..\packages\grpc.cpp.redist.1.0.1\build\native\grpc.cpp.redist.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\grpc.cpp.redist.1.0.1\build\native\grpc.cpp.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\grpc.cpp.redist.1.0.1\build\native\grpc.cpp.redist.targets'))" />
</Target>
</Project>
\ No newline at end of file
......@@ -30,4 +30,7 @@
<Filter>Quelldateien</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
</Project>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="grpc.cpp.redist" version="1.0.1" targetFramework="native" />
</packages>
\ No newline at end of file
Subproject commit 9b17d3ba73f3255bdafd9e1d9d7f39c729a35dd8
......@@ -8,10 +8,6 @@ ModeliGrpcServer::ModeliGrpcServer(std::shared_ptr<FmuEngine> fmuEngine) :_fmuEn
{
}
ModeliGrpcServer::~ModeliGrpcServer()
{
}
Status ModeliGrpcServer::Play(ServerContext * context, const::ModeliRpc::PlayRequest * request, ::ModeliRpc::PlayResponse * response)
{
response->set_status(static_cast<Fmi2Status>(_fmuEngine->Play()));
......
#pragma once
#include "../ModeliProtocol/ModeliRpc_Cpp/ModeliRpc.grpc.pb.h"
#include "ModeliRpc.grpc.pb.h"
#include "IEngineObserver.hpp"
#include <memory>
#include <condition_variable>
......@@ -19,7 +19,6 @@ class ModeliGrpcServer final : public ModeliRpc::ModeliBackend::Service, Simulat
{
public:
ModeliGrpcServer(std::shared_ptr<FmuEngine> fmuEngine);
~ModeliGrpcServer();
// Play the simulation infinetly in realtime
Status Play(ServerContext* context, const ModeliRpc::PlayRequest* request, ModeliRpc::PlayResponse* response);
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -16,8 +16,12 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)ModeliGrpcServer.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ModeliRpc.grpc.pb.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)ModeliRpc.pb.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)ModeliGrpcServer.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)ModeliRpc.grpc.pb.cc" />
<ClCompile Include="$(MSBuildThisFileDirectory)ModeliRpc.pb.cc" />
</ItemGroup>
</Project>
\ No newline at end of file
......@@ -7,17 +7,29 @@
</Filter>
<Filter Include="Source">
<UniqueIdentifier>{868932fc-5bfe-4349-902c-07dd36a4c1b0}</UniqueIdentifier>
<Extensions>cpp;c</Extensions>
<Extensions>cpp;c;cc</Extensions>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)ModeliGrpcServer.cpp">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)ModeliRpc.grpc.pb.cc">
<Filter>Source</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)ModeliRpc.pb.cc">
<Filter>Source</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)ModeliGrpcServer.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ModeliRpc.grpc.pb.h">
<Filter>Header</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)ModeliRpc.pb.h">
<Filter>Header</Filter>
</ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment