From 6a437abcde0e6255e98591baa15b3f8c6825a24b Mon Sep 17 00:00:00 2001 From: Lily <47812810+LilyWangL@users.noreply.github.com> Date: Sat, 31 Oct 2020 03:53:55 +0800 Subject: [PATCH] [opensubdiv] Enable support Linux and MacOS (#14276) --- ports/opensubdiv/portfile.cmake | 10 +++++++++- ports/opensubdiv/vcpkg.json | 2 +- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/ports/opensubdiv/portfile.cmake b/ports/opensubdiv/portfile.cmake index c23e14476f..f4c8bf1d8e 100644 --- a/ports/opensubdiv/portfile.cmake +++ b/ports/opensubdiv/portfile.cmake @@ -1,4 +1,4 @@ -vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "linux" "osx" "uwp") +vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "uwp") vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH @@ -10,6 +10,14 @@ vcpkg_from_github( fix_compile-option.patch ) +if(VCPKG_TARGET_IS_LINUX) + message( +"OpenSubdiv currently requires the following libraries from the system package manager: + xinerama + +These can be installed on Ubuntu systems via sudo apt install libxinerama-dev") +endif() + vcpkg_find_acquire_program(PYTHON2) get_filename_component(PYTHON2_DIR "${PYTHON2}" DIRECTORY) vcpkg_add_to_path("${PYTHON2_DIR}") diff --git a/ports/opensubdiv/vcpkg.json b/ports/opensubdiv/vcpkg.json index b66c98d7ba..0849aaa598 100644 --- a/ports/opensubdiv/vcpkg.json +++ b/ports/opensubdiv/vcpkg.json @@ -3,5 +3,5 @@ "version-string": "3.4.3", "description": "An Open-Source subdivision surface library.", "homepage": "https://github.com/PixarAnimationStudios/OpenSubdiv", - "supports": "windows & !arm & !uwp" + "supports": "!arm & !uwp" }