3party/vcpkg
0
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-01 05:27:52 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #838 from codicodi/fix-cairo

Browse Source 
[cairo] fix build
This commit is contained in:
Robert Schumacher 2017-03-22 15:32:47 -07:00 committed by GitHub
commit 9f949f7e75
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ports/cairo/CMakeLists_cairo.txt
View File

@ -252,7 +252,7 @@ if (FONTCONFIG_LIBRARY MATCHES NOTFOUND)
message(FATAL_ERROR "The fontconfig library could not be found. Check to ensure that it is properly installed.")
endif()
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
if (BUILD_SHARED_LIBS)
add_library(cairo ${SOURCES})
# cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
target_compile_options(cairo PUBLIC "/wd4244" PUBLIC "/wd4146" PUBLIC "/wd4312" PUBLIC "/wd4267" PUBLIC "/wd4996" PUBLIC "/wd4311" PUBLIC "/wd4334" PUBLIC "/wd4101")
@ -263,7 +263,7 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
LIBRARY DESTINATION bin
ARCHIVE DESTINATION lib
)
elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static)
else()
add_library(cairo-static ${SOURCES})
target_compile_options(cairo-static PUBLIC "/DCAIRO_WIN32_STATIC_BUILD=1")
# cairo produces a lot of warnings which are disabled here because they otherwise fill up the log files
@ -275,8 +275,6 @@ elseif (VCPKG_LIBRARY_LINKAGE STREQUAL static)
LIBRARY DESTINATION lib
ARCHIVE DESTINATION lib
)
else()
message(FATAL_ERROR "VCPKG_LIBRARY_LINKAGE is not defined or has an unexpected value")
endif()
# GObject support module