Skip to content

Commit 7895d1e

Browse files
florelisflorelis
committed
Add missing flags for vcpkg
1 parent 4b70fc0 commit 7895d1e

6 files changed

Lines changed: 30 additions & 2 deletions

File tree

‎src/AppInstallerCLI.sln‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,9 +183,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "VcpkgCustomTriplets", "Vcpk
183183
VcpkgCustomTriplets\arm64-release.cmake = VcpkgCustomTriplets\arm64-release.cmake
184184
VcpkgCustomTriplets\arm64.cmake = VcpkgCustomTriplets\arm64.cmake
185185
VcpkgCustomTriplets\common.cmake = VcpkgCustomTriplets\common.cmake
186+
VcpkgCustomTriplets\fuzzing.cmake = VcpkgCustomTriplets\fuzzing.cmake
187+
VcpkgCustomTriplets\x64-fuzzing.cmake = VcpkgCustomTriplets\x64-fuzzing.cmake
186188
VcpkgCustomTriplets\x64-release-static.cmake = VcpkgCustomTriplets\x64-release-static.cmake
187189
VcpkgCustomTriplets\x64-release.cmake = VcpkgCustomTriplets\x64-release.cmake
188190
VcpkgCustomTriplets\x64.cmake = VcpkgCustomTriplets\x64.cmake
191+
VcpkgCustomTriplets\x86-fuzzing.cmake = VcpkgCustomTriplets\x86-fuzzing.cmake
189192
VcpkgCustomTriplets\x86-release-static.cmake = VcpkgCustomTriplets\x86-release-static.cmake
190193
VcpkgCustomTriplets\x86-release.cmake = VcpkgCustomTriplets\x86-release.cmake
191194
VcpkgCustomTriplets\x86.cmake = VcpkgCustomTriplets\x86.cmake

‎src/VcpkgCustomTriplets/common.cmake‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,19 @@ set(VCPKG_LIBRARY_LINKAGE static)
22
set(VCPKG_C_FLAGS "/Qspectre /W3 /guard:cf")
33
set(VCPKG_CXX_FLAGS "/Qspectre /W3 /guard:cf")
44
set(VCPKG_INSTALL_OPTIONS, "--debug")
5+
6+
if(PORT MATCHES "cpprestsdk")
7+
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_NO_ASYNCRTIMP /DCPPREST_EXCLUDE_WEBSOCKETS")
8+
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /D_NO_ASYNCRTIMP /DCPPREST_EXCLUDE_WEBSOCKETS")
9+
elseif(PORT MATCHES "detours")
10+
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_LIB")
11+
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /D_LIB")
12+
elseif(PORT MATCHES "jsoncpp")
13+
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /D_DISABLE_VECTOR_ANNOTATION /D_DISABLE_STRING_ANNOTATION")
14+
set(VCPKG_CXX_FLAGS "${VCPKG_C_FLAGS} /D_DISABLE_VECTOR_ANNOTATION /D_DISABLE_STRING_ANNOTATION")
15+
elseif(PORT MATCHES "libyaml")
16+
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /DYAML_DECLARE_STATIC /DHAVE_CONFIG_H")
17+
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /DYAML_DECLARE_STATIC /DHAVE_CONFIG_H")
18+
endif()
19+
20+
message("Compilation flags for ${PORT}: ${VCPKG_CXX_FLAGS}")

‎src/VcpkgCustomTriplets/fuzzing.cmake‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
if(PORT MATCHES "jsoncpp|libyaml")
2+
set(VCPKG_C_FLAGS "${VCPKG_C_FLAGS} /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div")
3+
set(VCPKG_CXX_FLAGS "${VCPKG_CXX_FLAGS} /fsanitize=address /fsanitize-coverage=inline-8bit-counters /fsanitize-coverage=edge /fsanitize-coverage=trace-cmp /fsanitize-coverage=trace-div")
4+
message("FLAGS ${VCPKG_CXX_FLAGS}")
5+
endif()

‎src/VcpkgCustomTriplets/x64-fuzzing.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include("${CMAKE_CURRENT_LIST_DIR}/x64-release-static.cmake")
2+
include("${CMAKE_CURRENT_LIST_DIR}/fuzzing.cmake")

‎src/VcpkgCustomTriplets/x86-fuzzing.cmake‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
include("${CMAKE_CURRENT_LIST_DIR}/x86-release-static.cmake")
2+
include("${CMAKE_CURRENT_LIST_DIR}/fuzzing.cmake")

‎src/vcpkg.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@
4141
<VcpkgConfiguration>Release</VcpkgConfiguration>
4242
</PropertyGroup>
4343
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Fuzzing|x64'">
44-
<VcpkgTriplet>x64-release-static</VcpkgTriplet>
44+
<VcpkgTriplet>x64-fuzzing</VcpkgTriplet>
4545
<VcpkgConfiguration>Release</VcpkgConfiguration>
4646
</PropertyGroup>
4747
<PropertyGroup Label="Vcpkg" Condition="'$(Configuration)|$(Platform)'=='Fuzzing|Win32'">
48-
<VcpkgTriplet>x86-release-static</VcpkgTriplet>
48+
<VcpkgTriplet>x86-fuzzing</VcpkgTriplet>
4949
<VcpkgConfiguration>Release</VcpkgConfiguration>
5050
</PropertyGroup>
5151
</Project>

0 commit comments

Comments
 (0)