Skip to content

[pangolin] Refix dependency python and fix dependency glew #13251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JackBoosY wants to merge 2 commits into from
Closed

[pangolin] Refix dependency python and fix dependency glew #13251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0a7e9b
[pangolin] Refix dependency and fix dependency glew
Aug 31, 2020
06a581c
[pangolin] Re-fix dependency glew
Sep 1, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ports/pangolin/CONTROL
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,12 @@
Source: pangolin
Version: 0.5
Port-Version: 9
Port-Version: 10
Build-Depends: eigen3, glew, libpng, libjpeg-turbo, ffmpeg
Homepage: https://github.com/stevenlovegrove/Pangolin
Description: Lightweight GUI Library
Supports: !uwp & !osx & !(windows&static)
Default-Features: python

Feature: python
Build-Depends: python3
Description: Build with python
16 changes: 16 additions & 0 deletions ports/pangolin/fix-dependency-glew.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4047714..e4e149c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -62,6 +62,11 @@ if(_OSX_)
set(CMAKE_MACOSX_RPATH ON)
endif()

+if (NOT BUILD_EXTERN_GLEW)
+ find_package(GLEW REQUIRED)
+ link_libraries(GLEW::GLEW)
+endif()
+
# Overide with cmake -DCMAKE_BUILD_TYPE=Debug {dir}
if( NOT CMAKE_BUILD_TYPE AND NOT _WIN_ )
message("Build type not set (defaults to release)")
14 changes: 0 additions & 14 deletions ports/pangolin/fix-dependency-python.patch
View file
Open in desktop

This file was deleted.

10 changes: 8 additions & 2 deletions ports/pangolin/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,17 +10,23 @@ vcpkg_from_github(
deprecated_constants.patch # Change from upstream pangolin to address build failures from latest ffmpeg library
fix-includepath-error.patch # include path has one more ../
fix-dependeny-ffmpeg.patch
fix-dependency-python.patch
fix-dependency-glew.patch
)

file(REMOVE ${SOURCE_PATH}/CMakeModules/FindGLEW.cmake)

string(COMPARE EQUAL "${VCPKG_CRT_LINKAGE}" "static" MSVC_USE_STATIC_CRT)

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
INVERTED_FEATURES
python CMAKE_DISABLE_FIND_PACKAGE_PythonLibs
)

vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
OPTIONS
OPTIONS ${FEATURE_OPTIONS}
-DBUILD_EXTERN_GLEW=OFF
-DBUILD_EXTERN_LIBPNG=OFF
-DBUILD_EXTERN_LIBJPEG=OFF
Expand Down