Skip to content

Commit

Permalink
fix sln include path, link to static library
Browse files Browse the repository at this point in the history
  • Loading branch information
Simplxss committed Aug 15, 2023
1 parent 4f76e78 commit 2fdb623
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 17 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ if(MDF_BUILD_TOOL AND VCPKG)
endif()
option(MDF_BUILD_TEST "Build Google unit tests. Requires Google Test." OFF)
if(MDF_BUILD_TEST AND VCPKG)
# GTest is not available for static linking
string(REPLACE "-static" "" VCPKG_TARGET_TRIPLET "${VCPKG_TARGET_TRIPLET}")
list(APPEND VCPKG_MANIFEST_FEATURES "mdflibtest")
endif()

Expand Down
2 changes: 2 additions & 0 deletions CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"VCPKG_TARGET_TRIPLET": "x64-windows-static",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}"
}
},
Expand All @@ -35,6 +36,7 @@
"binaryDir": "${sourceDir}/build/${presetName}",
"cacheVariables": {
"CMAKE_TOOLCHAIN_FILE": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake",
"VCPKG_TARGET_TRIPLET": "x86-windows-static",
"CMAKE_INSTALL_PREFIX": "${sourceDir}/install/${presetName}"
}
}
Expand Down
14 changes: 0 additions & 14 deletions mdflib.sln
Original file line number Diff line number Diff line change
Expand Up @@ -11,46 +11,32 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "mdflib", "mdflib\mdflib.vcx
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|x64 = Debug|x64
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU
Release|x64 = Release|x64
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Debug|x64.ActiveCfg = Debug|x64
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Debug|x64.Build.0 = Debug|x64
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Debug|x86.ActiveCfg = Debug|Any CPU
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Debug|x86.Build.0 = Debug|Any CPU
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Release|Any CPU.Build.0 = Release|Any CPU
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Release|x64.ActiveCfg = Release|x64
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Release|x64.Build.0 = Release|x64
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Release|x86.ActiveCfg = Release|Any CPU
{C3DE21C3-EDB7-4D49-AEA0-6EF79DB5634C}.Release|x86.Build.0 = Release|Any CPU
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Debug|Any CPU.ActiveCfg = Debug|x64
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Debug|Any CPU.Build.0 = Debug|x64
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Debug|x64.ActiveCfg = Debug|x64
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Debug|x64.Build.0 = Debug|x64
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Debug|x86.ActiveCfg = Debug|Win32
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Debug|x86.Build.0 = Debug|Win32
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Release|Any CPU.ActiveCfg = Release|x64
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Release|Any CPU.Build.0 = Release|x64
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Release|x64.ActiveCfg = Release|x64
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Release|x64.Build.0 = Release|x64
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Release|x86.ActiveCfg = Release|Win32
{B4BBB914-C5F3-4893-B4FF-3138BCF6782B}.Release|x86.Build.0 = Release|Win32
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Debug|Any CPU.ActiveCfg = Debug|x64
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Debug|Any CPU.Build.0 = Debug|x64
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Debug|x64.ActiveCfg = Debug|x64
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Debug|x64.Build.0 = Debug|x64
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Debug|x86.ActiveCfg = Debug|Win32
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Debug|x86.Build.0 = Debug|Win32
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Release|Any CPU.ActiveCfg = Release|x64
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Release|Any CPU.Build.0 = Release|x64
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Release|x64.ActiveCfg = Release|x64
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Release|x64.Build.0 = Release|x64
{4EA4C08D-2555-493B-B3B6-0E26381D0A09}.Release|x86.ActiveCfg = Release|Win32
Expand Down
12 changes: 9 additions & 3 deletions mdflib/mdflib.vcxproj
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,16 @@
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<IncludePath>../include;$(IncludePath)</IncludePath>
<ExternalIncludePath>../include;$(ExternalIncludePath)</ExternalIncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<IncludePath>../include;$(IncludePath)</IncludePath>
<ExternalIncludePath>../include;$(ExternalIncludePath)</ExternalIncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ExternalIncludePath>../include;$(ExternalIncludePath)</ExternalIncludePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ExternalIncludePath>../include;$(ExternalIncludePath)</ExternalIncludePath>
</PropertyGroup>
<PropertyGroup Label="Vcpkg">
<VcpkgEnableManifest>true</VcpkgEnableManifest>
Expand Down Expand Up @@ -122,7 +128,7 @@
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<LanguageStandard>stdcpp17</LanguageStandard>
<AdditionalIncludeDirectories>K:\zlib\master\include;K:\expat\master\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<LanguageStandard_C>stdc17</LanguageStandard_C>
</ClCompile>
<Link>
Expand Down

0 comments on commit 2fdb623

Please sign in to comment.