From 28184550d02c3fa43b6958163eddcd09649eff86 Mon Sep 17 00:00:00 2001 From: codicodi Date: Wed, 22 Mar 2017 20:19:03 +0100 Subject: [PATCH] [cairo] fix build --- ports/cairo/CMakeLists_cairo.txt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ports/cairo/CMakeLists_cairo.txt b/ports/cairo/CMakeLists_cairo.txt index 85cf9457ceeed1..33077bc21e8b9f 100644 --- a/ports/cairo/CMakeLists_cairo.txt +++ b/ports/cairo/CMakeLists_cairo.txt @@ -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