diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2021-09-03 09:01:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-09-02 18:01:14 -0700 |
| commit | 8db63fc1157367a39f94c4f8a72376430c21a965 (patch) | |
| tree | 474e2f630c645b1897c378cbb262527ad60ccd21 /ports/pangolin/fix-dependency-python.patch | |
| parent | 7e7bcf89171b7ed84ece845b1fa596a018e462f2 (diff) | |
| download | vcpkg-8db63fc1157367a39f94c4f8a72376430c21a965.tar.gz vcpkg-8db63fc1157367a39f94c4f8a72376430c21a965.zip | |
[pangolin] Update to 0.6 and also support osx (#19840)
* [pangolin] Update to 0.6
* Update version files
* Format manifest
* Revert to CRLF in original patches
* Update versions/p-/pangolin.json
* Support osx and add features
* Remove extra space line
* Update versions/p-/pangolin.json
* Remove unused options
* Update versions/p-/pangolin.json
* Add MAYBE_UNUSED_VARIABLES
* Update versions/p-/pangolin.json
Diffstat (limited to 'ports/pangolin/fix-dependency-python.patch')
| -rw-r--r-- | ports/pangolin/fix-dependency-python.patch | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/ports/pangolin/fix-dependency-python.patch b/ports/pangolin/fix-dependency-python.patch index 67eae1288..276e0f092 100644 --- a/ports/pangolin/fix-dependency-python.patch +++ b/ports/pangolin/fix-dependency-python.patch @@ -1,14 +1,15 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 7f364a7..9e0baac 100644 +index ddeb144..49dcf02 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -213,6 +213,9 @@ endif() - find_package(PythonLibs QUIET) - if(BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND PYTHONLIBS_FOUND AND NOT _WIN_) - set(HAVE_PYTHON 1) +@@ -299,7 +299,9 @@ if(BUILD_PANGOLIN_PYTHON AND BUILD_PANGOLIN_GUI AND BUILD_PANGOLIN_VARS AND NOT + + if(pybind11_FOUND) + set(HAVE_PYTHON 1) +- + if (UNIX) + set(PYTHON_LIBRARY ${PYTHON_LIBRARY} dl util) + endif() - list(APPEND HEADERS - ${INCDIR}/console/ConsoleInterpreter.h - ${INCDIR}/console/ConsoleView.h + file(GLOB pypangolin_SRC "python/pypangolin/*.cpp" ) + file(GLOB pypangolin_HDR "python/pypangolin/*.hpp" ) + list(APPEND HEADERS |