mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 08:58:59 +08:00
9b61080abc
Fix one of https://github.com/microsoft/vcpkg/issues/32398 issue.
When install opensubdiv[core,tbb]:x64-windows and
opensubdiv[core,tbb]:x64-linux will get this error:
````
FAILED: opensubdiv/osd/CMakeFiles/osd_cpu_obj.dir/tbbEvaluator.cpp.obj
C:\PROGRA~1\MIB055~1\2022\COMMUN~1\VC\Tools\MSVC\1439~1.335\bin\Hostx64\x64\cl.exe /TP -DNOMINMAX -DOPENSUBDIV_HAS_TBB -DOPENSUBDIV_VERSION_STRING=\"3.5.0\" -DTBB_USE_DEBUG -D_CRT_SECURE_NO_WARNINGS -D_USE_MATH_DEFINES -IF:\test\vcpkg\buildtrees\opensubdiv\src\a0796b160c-fe5b1b6d5d\opensubdiv -IF:\test\vcpkg\buildtrees\opensubdiv\x64-windows-dbg\opensubdiv\osd -external:IF:\test\vcpkg\installed\x64-windows\include -external:W0 /nologo /DWIN32 /D_WINDOWS /W3 /utf-8 /GR /EHsc /MP /D_DEBUG /MDd /Z7 /Ob0 /Od /RTC1 /Wall /W3 /wd4005 /wd4350 /wd4548 /showIncludes /Foopensubdiv\osd\CMakeFiles\osd_cpu_obj.dir\tbbEvaluator.cpp.obj /Fdopensubdiv\osd\CMakeFiles\osd_cpu_obj.dir\ /FS -c F:\test\vcpkg\buildtrees\opensubdiv\src\a0796b160c-fe5b1b6d5d\opensubdiv\osd\tbbEvaluator.cpp
F:\test\vcpkg\buildtrees\opensubdiv\src\a0796b160c-fe5b1b6d5d\opensubdiv\osd\tbbEvaluator.cpp(28): fatal error C1083: Cannot open include file: 'tbb/task_scheduler_init.h': No such file or directory
````
Because the task_scheduler_init.h header file no longer exists in the
latest
[Tbb](https://github.com/oneapi-src/oneTBB/tree/master/include/tbb)
file, I refer to the
[upstream](7d0ab5530f/opensubdiv/osd/tbbEvaluator.cpp (L30)
)
modification to add judgment conditions to ensure that the old version
is available.
- [x] Changes comply with the [maintainer
guide](https://github.com/microsoft/vcpkg-docs/blob/main/vcpkg/contributing/maintainer-guide.md).
- [ ] ~~SHA512s are updated for each updated download.~~
- [ ] ~~The "supports" clause reflects platforms that may be fixed by
this new version.~~
- [ ] ~~Any fixed [CI
baseline](https://github.com/microsoft/vcpkg/blob/master/scripts/ci.baseline.txt)
entries are removed from that file.~~
- [ ] ~~Any patches that are no longer applied are deleted from the
port's directory.~~
- [x] The version database is fixed by rerunning `./vcpkg x-add-version
--all` and committing the result.
- [x] Only one version is added to each modified port's versions file.
---------
Co-authored-by: Jon <v-zhli17@microsoft.com>
141 lines
4.4 KiB
CMake
141 lines
4.4 KiB
CMake
if (VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_IOS)
|
|
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
|
|
endif()
|
|
|
|
vcpkg_from_github(
|
|
OUT_SOURCE_PATH SOURCE_PATH
|
|
REPO PixarAnimationStudios/OpenSubdiv
|
|
REF 8ffa2b6566be10209529d7a0d1db02a0796b160c # v3.5.0
|
|
SHA512 cb48470f044ca4e9fcdfb3ff05d710fd710212d5a2f539f3f90ebb33cc6a6b1530fd9deb7d3eb25b275133dbdf5c1a5d4777b289d13b15006a59db12e8b28398
|
|
HEAD_REF release
|
|
PATCHES
|
|
fix_compile-option.patch
|
|
fix-version-search.patch
|
|
fix-build-type.patch
|
|
fix-dependencies.patch
|
|
fix-feature-cuda.patch
|
|
fix-notfind-header.patch
|
|
)
|
|
|
|
if(VCPKG_TARGET_IS_LINUX)
|
|
message(
|
|
"OpenSubdiv currently requires the following libraries from the system package manager:
|
|
xinerama xxf86vm
|
|
|
|
These can be installed on Ubuntu systems via sudo apt install libxinerama-dev libxxf86vm-dev")
|
|
endif()
|
|
|
|
vcpkg_find_acquire_program(PYTHON3)
|
|
get_filename_component(PYTHON3_DIR "${PYTHON3}" DIRECTORY)
|
|
vcpkg_add_to_path("${PYTHON3_DIR}")
|
|
|
|
if (VCPKG_CRT_LINKAGE STREQUAL static)
|
|
set(STATIC_CRT_LNK ON)
|
|
else()
|
|
set(STATIC_CRT_LNK OFF)
|
|
endif()
|
|
|
|
if ("cuda" IN_LIST FEATURES AND VCPKG_TARGET_ARCHITECTURE STREQUAL "x86")
|
|
message(FATAL_ERROR "Feature 'cuda' can only build on x64 arch.")
|
|
endif()
|
|
|
|
if (("dx" IN_LIST FEATURES OR "omp" IN_LIST FEATURES) AND NOT VCPKG_TARGET_IS_WINDOWS)
|
|
message(FATAL_ERROR "Feature 'dx' and 'omp' only support Windows.")
|
|
endif()
|
|
|
|
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
|
FEATURES
|
|
"true-deriv-eval" OPENSUBDIV_GREGORY_EVAL_TRUE_DERIVATIVES
|
|
INVERTED_FEATURES
|
|
"cuda" NO_CUDA
|
|
"dx" NO_DX
|
|
"examples" NO_EXAMPLES
|
|
"glew" NO_GLEW
|
|
"glfw" NO_GLFW
|
|
"glfw" NO_GLFW_X11
|
|
"omp" NO_OMP
|
|
"opencl" NO_OPENCL
|
|
"opengl" NO_OPENGL
|
|
"ptex" NO_PTEX
|
|
"tbb" NO_TBB
|
|
"tutorials" NO_TUTORIALS
|
|
)
|
|
|
|
set(OSD_EXTRA_OPTS)
|
|
if ("ptex" IN_LIST FEATURES)
|
|
list(APPEND OSD_EXTRA_OPTS -DPTEX_LOCATION=${CURRENT_INSTALLED_DIR})
|
|
endif()
|
|
if ("glew" IN_LIST FEATURES)
|
|
list(APPEND OSD_EXTRA_OPTS -DGLEW_LOCATION=${CURRENT_INSTALLED_DIR})
|
|
endif()
|
|
if ("glfw" IN_LIST FEATURES)
|
|
list(APPEND OSD_EXTRA_OPTS -DGLFW_LOCATION=${CURRENT_INSTALLED_DIR})
|
|
endif()
|
|
if ("dx" IN_LIST FEATURES)
|
|
list(APPEND OSD_EXTRA_OPTS -DDXSDK_LOCATION=${CURRENT_INSTALLED_DIR})
|
|
endif()
|
|
if (VCPKG_TARGET_IS_OSX)
|
|
list(APPEND OSD_EXTRA_OPTS -DNO_METAL=OFF)
|
|
else()
|
|
list(APPEND OSD_EXTRA_OPTS -DNO_METAL=ON)
|
|
endif()
|
|
|
|
vcpkg_cmake_configure(
|
|
SOURCE_PATH ${SOURCE_PATH}
|
|
OPTIONS
|
|
-DMSVC_STATIC_CRT=${STATIC_CRT_LNK}
|
|
-DNO_LIB=OFF
|
|
-DNO_REGRESSION=ON
|
|
-DNO_DOC=ON
|
|
-DNO_TESTS=ON
|
|
-DNO_GLTESTS=ON
|
|
-DNO_CLEW=ON
|
|
${FEATURE_OPTIONS}
|
|
${OSD_EXTRA_OPTS}
|
|
MAYBE_UNUSED_VARIABLES
|
|
MSVC_STATIC_CRT
|
|
)
|
|
|
|
vcpkg_cmake_install()
|
|
|
|
if ("examples" IN_LIST FEATURES)
|
|
if ("dx" IN_LIST FEATURES)
|
|
vcpkg_copy_tools(TOOL_NAMES dxViewer AUTO_CLEAN)
|
|
if ("ptex" IN_LIST FEATURES)
|
|
vcpkg_copy_tools(TOOL_NAMES dxPtexViewer AUTO_CLEAN)
|
|
endif()
|
|
endif()
|
|
endif()
|
|
|
|
if ("tutorials" IN_LIST FEATURES)
|
|
file(GLOB TUTORIALS_TOOLS "${CURRENT_PACKAGES_DIR}/bin/tutorials/*${VCPKG_TARGET_EXECUTABLE_SUFFIX}")
|
|
set(TUTORIALS_TOOL_NAMES )
|
|
foreach(TUTORIALS_TOOL IN LISTS TUTORIALS_TOOLS)
|
|
get_filename_component(TUTORIALS_TOOL_NAME "${TUTORIALS_TOOL}" NAME_WE)
|
|
list(APPEND TUTORIALS_TOOL_NAMES "${TUTORIALS_TOOL_NAME}")
|
|
endforeach()
|
|
if (TUTORIALS_TOOL_NAMES)
|
|
vcpkg_copy_tools(TOOL_NAMES ${TUTORIALS_TOOL_NAMES} SEARCH_DIR "${CURRENT_PACKAGES_DIR}/bin/tutorials/" AUTO_CLEAN)
|
|
endif()
|
|
endif()
|
|
|
|
vcpkg_copy_pdbs()
|
|
vcpkg_cmake_config_fixup(PACKAGE_NAME OpenSubdiv CONFIG_PATH lib/cmake/OpenSubdiv)
|
|
vcpkg_fixup_pkgconfig()
|
|
|
|
# The header files are read only and can't remove when remove this port
|
|
file(GLOB_RECURSE OSD_HDRS "${CURRENT_PACKAGES_DIR}/include/*.h")
|
|
file(CHMOD_RECURSE ${OSD_HDRS}
|
|
PERMISSIONS
|
|
OWNER_READ OWNER_WRITE
|
|
GROUP_READ GROUP_WRITE
|
|
WORLD_READ WORLD_WRITE
|
|
)
|
|
|
|
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include"
|
|
"${CURRENT_PACKAGES_DIR}/bin"
|
|
"${CURRENT_PACKAGES_DIR}/debug/bin"
|
|
)
|
|
|
|
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE.txt")
|