diff options
| author | Michael Bauer <michael.mi.bauer@partner.bmw.de> | 2014-04-02 16:31:21 +0200 |
|---|---|---|
| committer | Michael Bauer <michael.mi.bauer@partner.bmw.de> | 2014-04-02 16:31:21 +0200 |
| commit | 99b6fe38a77bf9cc7555b7d9fa02b682ed45b942 (patch) | |
| tree | beeba2a27db5b1c5aa1411cb13985c339a80a746 | |
| parent | 44419ccb84262ac80e15c2d22710cb3d03382d98 (diff) | |
| download | genivi-common-api-runtime-99b6fe38a77bf9cc7555b7d9fa02b682ed45b942.tar.gz | |
changing hardcoded GTEST directory path to a property. setting build dependency from Tests project to CommonAPI. Adding CommonAPI.lib to additional libraries of Tests.vcxproj. Adding path of SolutionDir/Debug to additional library directories of Tests.vcxproj
| -rw-r--r-- | CommonAPI.sln | 5 | ||||
| -rw-r--r-- | Tests.vcxproj | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/CommonAPI.sln b/CommonAPI.sln index b10dbd0..025d1c9 100644 --- a/CommonAPI.sln +++ b/CommonAPI.sln @@ -1,9 +1,12 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.20827.3
+VisualStudioVersion = 12.0.21005.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Test", "Tests.vcxproj", "{872A0F1D-2EB9-443D-9869-B7F699CC0DE2}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C18FDEDE-810E-405D-9100-57A1CC5C78A9} = {C18FDEDE-810E-405D-9100-57A1CC5C78A9}
+ EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CommonAPI", "CommonAPI.vcxproj", "{C18FDEDE-810E-405D-9100-57A1CC5C78A9}"
EndProject
diff --git a/Tests.vcxproj b/Tests.vcxproj index 5cc6625..e737336 100644 --- a/Tests.vcxproj +++ b/Tests.vcxproj @@ -44,8 +44,8 @@ <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <IncludePath>C:\work\bmw\2.0\gtest-1.7.0\include;$(SolutionDir)\src\test;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
- <LibraryPath>C:\work\bmw\2.0\gtest-1.7.0\msvc\gtest\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
+ <IncludePath>$(GTEST)\include;$(SolutionDir)\src\test;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
+ <LibraryPath>$(GTEST)\msvc\gtest\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
@@ -63,8 +63,8 @@ <Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>gtestd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(SolutionDir)Debug;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>gtestd.lib;CommonAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|