diff options
| author | Michael Bauer <michael.mi.bauer@partner.bmw.de> | 2014-04-04 12:23:45 +0200 |
|---|---|---|
| committer | Michael Bauer <michael.mi.bauer@partner.bmw.de> | 2014-04-04 12:23:45 +0200 |
| commit | c7f784c89bc6798dbccb90ed377582f3ba7d295b (patch) | |
| tree | 4a13a6db7e9f85a367daed7c03f80915127af8f6 | |
| parent | b13cdeaf0998910a5efdfca96f0fdcb9df9dbd3f (diff) | |
| download | genivi-common-api-dbus-runtime-c7f784c89bc6798dbccb90ed377582f3ba7d295b.tar.gz | |
modified vcxproj file of UnitTests to now use environment variables and relative paths, adapted build execution order in .sln
| -rw-r--r-- | CommonAPI-DBus.sln | 5 | ||||
| -rw-r--r-- | UnitTests.vcxproj | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/CommonAPI-DBus.sln b/CommonAPI-DBus.sln index 4df764f..19e7547 100644 --- a/CommonAPI-DBus.sln +++ b/CommonAPI-DBus.sln @@ -1,11 +1,14 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
+# Visual Studio Express 2013 for Windows Desktop
VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonAPI-DBus", "CommonAPI-DBus.vcxproj", "{D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "UnitTests", "UnitTests.vcxproj", "{A437B05C-A664-493D-B60A-822A3A7A1CED}"
+ ProjectSection(ProjectDependencies) = postProject
+ {D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C} = {D3B0744D-2A3E-4C36-9AA0-534D6BD5A44C}
+ EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/UnitTests.vcxproj b/UnitTests.vcxproj index 8ba96d0..625691e 100644 --- a/UnitTests.vcxproj +++ b/UnitTests.vcxproj @@ -37,6 +37,7 @@ <ClCompile Include="src\test\commonapi\tests\TestInterfaceDBusStubAdapter.cpp" />
<ClCompile Include="src\test\commonapi\tests\TestInterfaceStubDefault.cpp" />
<ClCompile Include="src\test\DBusAddressTranslatorTest.cpp" />
+ <ClCompile Include="src\test\DBusBroadcastTest.cpp" />
<ClCompile Include="src\test\DBusClientIdTest.cpp" />
<ClCompile Include="src\test\DBusCommunicationTest.cpp" />
<ClCompile Include="src\test\DBusConnectionTest.cpp" />
@@ -52,7 +53,6 @@ <ClCompile Include="src\test\DBusPolymorphicTest.cpp" />
<ClCompile Include="src\test\DBusProxyTest.cpp" />
<ClCompile Include="src\test\DBusRuntimeTest.cpp" />
- <ClCompile Include="src\test\DBusSelectiveBroadcastTest.cpp" />
<ClCompile Include="src\test\DBusServicePublisherTest.cpp" />
<ClCompile Include="src\test\DBusServiceRegistryTest.cpp" />
<ClCompile Include="src\test\DBusTypeStreamTest.cpp" />
@@ -156,8 +156,8 @@ <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <LibraryPath>C:\work\bmw\2.0\dbus\cmake\bin\Debug;C:\work\bmw\2.0\gtest-1.7.0\msvc\gtest\Debug;C:\work\bmw\vs21\Common-API\Debug;$(SolutionDir)\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
- <IncludePath>C:\work\bmw\2.0\dbus;$(ProjectDir);$(SolutionDir)\src\test;$(SolutionDir)\src;C:\work\bmw\vs21\Common-API\src;C:\work\bmw\2.0\gtest-1.7.0\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+ <LibraryPath>C:\work\bmw\2.0\dbus\cmake\bin\Debug;$(GTEST)\msvc\gtest\Debug;..\ascgit017.CommonAPI\Debug;$(SolutionDir)\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
+ <IncludePath>$(DBUS_DIR);$(DBUS_BUILD_DIR);$(ProjectDir);$(SolutionDir)\src\test;$(SolutionDir)\src;..\ascgit017.CommonAPI\src;$(GTEST)\include;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
<SourcePath>$(SourcePath)</SourcePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|