diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-25 18:31:00 -0700 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-10-25 18:31:30 -0700 |
| commit | 133099fa2c46152474cfab052d0d1bcbc83749f2 (patch) | |
| tree | 92a0d3a63baaf0c643c19f219dbd48e26e4abde0 | |
| parent | 38522146d72e9d8192a0128833895f40e98f59c3 (diff) | |
| download | vcpkg-133099fa2c46152474cfab052d0d1bcbc83749f2.tar.gz vcpkg-133099fa2c46152474cfab052d0d1bcbc83749f2.zip | |
[pangolin] Fix glew dependency and fix usage of the crt
| -rw-r--r-- | ports/pangolin/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pangolin/portfile.cmake | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL index a4d670b74..a515ba50e 100644 --- a/ports/pangolin/CONTROL +++ b/ports/pangolin/CONTROL @@ -1,4 +1,4 @@ Source: pangolin -Version: 0.5-2 +Version: 0.5-3 Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg Description: Lightweight GUI Library diff --git a/ports/pangolin/portfile.cmake b/ports/pangolin/portfile.cmake index 3fe7ef8b6..19763f0d6 100644 --- a/ports/pangolin/portfile.cmake +++ b/ports/pangolin/portfile.cmake @@ -8,6 +8,10 @@ vcpkg_from_github( HEAD_REF master ) +file(REMOVE ${SOURCE_PATH}/CMakeModules/FindGLEW.cmake) + +string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_STATIC_CRT) + vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA @@ -16,6 +20,7 @@ vcpkg_configure_cmake( -DBUILD_EXTERN_GLEW=OFF -DBUILD_EXTERN_LIBPNG=OFF -DBUILD_EXTERN_LIBJPEG=OFF + -DMSVC_USE_STATIC_CRT=${MSVC_USE_STATIC_CRT} ) vcpkg_install_cmake() |