diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2017-03-22 15:32:47 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-22 15:32:47 -0700 |
| commit | 9f949f7e7543f5e8934260ba245bb63a48a1021a (patch) | |
| tree | 8a68be0136173c1c7bf2e50a06d067d711b367c6 | |
| parent | 9556e80576f759ad7433b8ae9d8b3cb3fb20315d (diff) | |
| parent | 28184550d02c3fa43b6958163eddcd09649eff86 (diff) | |
| download | vcpkg-9f949f7e7543f5e8934260ba245bb63a48a1021a.tar.gz vcpkg-9f949f7e7543f5e8934260ba245bb63a48a1021a.zip | |
Merge pull request #838 from codicodi/fix-cairo
[cairo] fix build
| -rw-r--r-- | ports/cairo/CMakeLists_cairo.txt | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ports/cairo/CMakeLists_cairo.txt b/ports/cairo/CMakeLists_cairo.txt index 85cf9457c..33077bc21 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 |