Browse Source

Remove Gtest again

build-windows
Thomas 3 years ago
parent
commit
7fea828b2b
3 changed files with 17 additions and 14 deletions
  1. +16
    -12
      build-windows/pEpMIME.vcxproj
  2. +0
    -1
      build-windows/packages.config
  3. +1
    -1
      src/to_utf8.cc

+ 16
- 12
build-windows/pEpMIME.vcxproj View File

@ -73,6 +73,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
<LibraryPath>$(LibraryPath)</LibraryPath>
<Linkage-libiconv>
</Linkage-libiconv>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<LinkIncremental>true</LinkIncremental>
@ -80,6 +82,8 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
<LibraryPath>$(LibraryPath)</LibraryPath>
<Linkage-libiconv>
</Linkage-libiconv>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<LinkIncremental>false</LinkIncremental>
@ -92,19 +96,20 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;_DEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)pEpEngine\src;$(SolutionDir)Dependencies;$(SolutionDir)Dependencies\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)Dependencies\vcpkg\installed\x86-windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalUsingDirectories>
</AdditionalUsingDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)Dependencies\libiconv\ReleaseStatic_Win32</AdditionalLibraryDirectories>
<AdditionalDependencies>libiconvStatic.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Lib>
<AdditionalLibraryDirectories>$(SolutionDir)Dependencies\libiconv\ReleaseStatic_Win32</AdditionalLibraryDirectories>
<AdditionalDependencies>libiconvStatic.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)Dependencies\vcpkg\installed\x86-windows\lib\</AdditionalLibraryDirectories>
<AdditionalDependencies>libiconv.lib</AdditionalDependencies>
<TargetMachine>MachineX86</TargetMachine>
</Lib>
<ProjectReference>
@ -135,19 +140,20 @@
<SDLCheck>true</SDLCheck>
<PreprocessorDefinitions>WIN32;NDEBUG;_LIB;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<ConformanceMode>true</ConformanceMode>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)pEp;$(SolutionDir)Dependencies;$(SolutionDir)Dependencies\libiconv\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir);$(SolutionDir)Dependencies\vcpkg\installed\x86-windows\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<GenerateDebugInformation>true</GenerateDebugInformation>
<AdditionalLibraryDirectories>$(SolutionDir)Dependencies\libiconv\ReleaseStatic_Win32</AdditionalLibraryDirectories>
<AdditionalDependencies>libiconvStatic.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>
</AdditionalLibraryDirectories>
<AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
<Lib>
<AdditionalDependencies>libiconvStatic.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)Dependencies\libiconv\ReleaseStatic_Win32</AdditionalLibraryDirectories>
<AdditionalDependencies>libiconv.lib</AdditionalDependencies>
<AdditionalLibraryDirectories>$(SolutionDir)Dependencies\vcpkg\installed\x86-windows\lib\</AdditionalLibraryDirectories>
</Lib>
<ProjectReference>
<LinkLibraryDependencies>true</LinkLibraryDependencies>
@ -215,14 +221,12 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\packages\gtest.1.7.0\build\native\gtest.targets" Condition="Exists('..\..\packages\gtest.1.7.0\build\native\gtest.targets')" />
<Import Project="..\..\packages\boost.1.69.0.0\build\boost.targets" Condition="Exists('..\..\packages\boost.1.69.0.0\build\boost.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\gtest.1.7.0\build\native\gtest.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\gtest.1.7.0\build\native\gtest.targets'))" />
<Error Condition="!Exists('..\..\packages\boost.1.69.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost.1.69.0.0\build\boost.targets'))" />
</Target>
</Project>

+ 0
- 1
build-windows/packages.config View File

@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.69.0.0" targetFramework="native" />
<package id="gtest" version="1.7.0" targetFramework="native" />
</packages>

+ 1
- 1
src/to_utf8.cc View File

@ -86,7 +86,7 @@ std::string to_utf8_iconv(const sv& charset, const std::string& s)
ret.reserve(s.size());
char buffer[ IconvBufSize ];
const char* in_p = const_cast<char*>(s.c_str()); // iconv sucks.
char* in_p = const_cast<char*>(s.c_str()); // iconv sucks.
size_t in_len = s.size();
while(in_len)


Loading…
Cancel
Save