diff options
author | Markus Freutsmiedl <markus.freutsmiedl@partner.bmw.de> | 2014-04-11 18:02:22 +0200 |
---|---|---|
committer | Markus Freutsmiedl <markus.freutsmiedl@partner.bmw.de> | 2014-04-11 18:05:58 +0200 |
commit | 799139884c3e9955c8486026ef2ab6d7210f744b (patch) | |
tree | a74dd41d1368b41aeac777254d589ea479312c8e | |
parent | 44c66cbcdb8e129f47db3d610b024f80263802bd (diff) | |
download | genivi-common-api-runtime-799139884c3e9955c8486026ef2ab6d7210f744b.tar.gz |
Project settings in project files reworked.
Additional information added for windows part in readme.
-rw-r--r-- | CommonAPI.vcxproj | 6 | ||||
-rw-r--r-- | README | 4 | ||||
-rw-r--r-- | Tests.vcxproj | 16 |
3 files changed, 17 insertions, 9 deletions
diff --git a/CommonAPI.vcxproj b/CommonAPI.vcxproj index 9c75106..b894a72 100644 --- a/CommonAPI.vcxproj +++ b/CommonAPI.vcxproj @@ -40,7 +40,9 @@ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<IncludePath>$(IncludePath)</IncludePath>
<LibraryPath>$(LibraryPath)</LibraryPath>
+ <TargetName>$(ProjectName)d</TargetName>
</PropertyGroup>
+ <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@@ -59,7 +61,7 @@ <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
</Lib>
<Lib>
- <AdditionalLibraryDirectories>C:\work\bmw\2.0\gtest-1.7.0\msvc\gtest\Debug;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<Verbose>true</Verbose>
</Lib>
</ItemDefinitionGroup>
@@ -70,6 +72,8 @@ <FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
<SDLCheck>true</SDLCheck>
+ <PreprocessorDefinitions>WIN32;COMMONAPI_INTERNAL_COMPILATION;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <DisableSpecificWarnings>4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<GenerateDebugInformation>true</GenerateDebugInformation>
@@ -56,6 +56,10 @@ If the environment variable GTEST_CONFIG is set to the path of the gtest-config To build the Windows version of CommonAPI with Visual Studio, you can use the solution file CommonAPI.sln. It is configured to build CommonAPI as a static library. To build the Tests project you have to set an environment variable called GTEST pointing to your gtest directory (e.g. C:\gtest-1.7.0), and if applicable restart your Visual Studio. +Information for building of gtest: +Download gtest from https://code.google.com/p/googletest/ e.g. gtest-1.7.0.zip +Unpack the archiv into a directory +Open the solution gtest-md.sln with Visual Studio 2013 and build gtest == Linking against CommonAPI diff --git a/Tests.vcxproj b/Tests.vcxproj index e737336..aade2c5 100644 --- a/Tests.vcxproj +++ b/Tests.vcxproj @@ -44,8 +44,7 @@ <PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <IncludePath>$(GTEST)\include;$(SolutionDir)\src\test;$(VC_IncludePath);$(WindowsSDK_IncludePath)</IncludePath>
- <LibraryPath>$(GTEST)\msvc\gtest\Debug;$(VC_LibraryPath_x86);$(WindowsSDK_LibraryPath_x86)</LibraryPath>
+ <TargetName>$(ProjectName)d</TargetName>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>true</LinkIncremental>
@@ -55,7 +54,7 @@ <PrecompiledHeader>NotUsing</PrecompiledHeader>
<WarningLevel>Level3</WarningLevel>
<Optimization>Disabled</Optimization>
- <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(SolutionDir)\src\test;$(GTEST)\include;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;COMMONAPI_INTERNAL_COMPILATION;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
<DebugInformationFormat>OldStyle</DebugInformationFormat>
@@ -63,8 +62,8 @@ <Link>
<SubSystem>Console</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
- <AdditionalLibraryDirectories>$(SolutionDir)Debug;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
- <AdditionalDependencies>gtestd.lib;CommonAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
+ <AdditionalLibraryDirectories>$(GTEST)\msvc\gtest-md\Debug;$(SolutionDir)\Debug;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>gtestd.lib;CommonAPId.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -74,8 +73,8 @@ <Optimization>MaxSpeed</Optimization>
<FunctionLevelLinking>true</FunctionLevelLinking>
<IntrinsicFunctions>true</IntrinsicFunctions>
- <AdditionalIncludeDirectories>$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+ <AdditionalIncludeDirectories>$(GTEST)\include;$(SolutionDir)\src\test;$(VCInstallDir)UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <PreprocessorDefinitions>WIN32;COMMONAPI_INTERNAL_COMPILATION;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<UseFullPaths>true</UseFullPaths>
</ClCompile>
<Link>
@@ -83,7 +82,8 @@ <GenerateDebugInformation>true</GenerateDebugInformation>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
- <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(GTEST)\msvc\gtest-md\Release;$(SolutionDir)\Release;$(VCInstallDir)UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalDependencies>gtest.lib;CommonAPI.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
|