diff options
| author | Martin Müller <muemart@users.noreply.github.com> | 2017-09-25 14:32:57 +0200 |
|---|---|---|
| committer | Martin Müller <muemart@users.noreply.github.com> | 2017-09-25 14:32:57 +0200 |
| commit | f4229f376205b681be8bdc0c58666c2aebc5d8c7 (patch) | |
| tree | 4206660f37d3394f3bc7ae74b249b432b1ce428b | |
| parent | a9f12be8f6e667afc2962df954d0898e897428a8 (diff) | |
| download | vcpkg-f4229f376205b681be8bdc0c58666c2aebc5d8c7.tar.gz vcpkg-f4229f376205b681be8bdc0c58666c2aebc5d8c7.zip | |
Use vcpkg's libraries for pangolin dependencies
Also fixes missing header that doesn't get installed
| -rw-r--r-- | ports/pangolin/CONTROL | 2 | ||||
| -rw-r--r-- | ports/pangolin/portfile.cmake | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/ports/pangolin/CONTROL b/ports/pangolin/CONTROL index 79b7f6947..39d4cadc7 100644 --- a/ports/pangolin/CONTROL +++ b/ports/pangolin/CONTROL @@ -1,4 +1,4 @@ Source: pangolin Version: 0.5-1 -Build-Depends: eigen3 +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 d93f9d7cd..e05acf5c6 100644 --- a/ports/pangolin/portfile.cmake +++ b/ports/pangolin/portfile.cmake @@ -13,6 +13,9 @@ vcpkg_configure_cmake( PREFER_NINJA OPTIONS -DCMAKE_WINDOWS_EXPORT_ALL_SYMBOLS=ON + -DBUILD_EXTERN_GLEW=OFF + -DBUILD_EXTERN_LIBPNG=OFF + -DBUILD_EXTERN_LIBJPEG=OFF ) vcpkg_install_cmake() @@ -39,6 +42,9 @@ file(WRITE ${CURRENT_PACKAGES_DIR}/share/pangolin/PangolinTargets-release.cmake file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) +# Copy missing header file +file(COPY ${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-dbg/src/include/pangolin/pangolin_export.h DESTINATION ${CURRENT_PACKAGES_DIR}/include/pangolin) + # Put the license file where vcpkg expects it file(COPY ${SOURCE_PATH}/LICENCE DESTINATION ${CURRENT_PACKAGES_DIR}/share/Pangolin/) file(RENAME ${CURRENT_PACKAGES_DIR}/share/Pangolin/LICENCE ${CURRENT_PACKAGES_DIR}/share/Pangolin/copyright) |