[opencascade] Update to 7.6.0 (#21314)

* [opencascade] Update to 7.6.0

* add homepage

Co-authored-by: Cheney-Wang <v-xincwa@microsoft.com>
This commit is contained in:
Cheney Wang 2021-11-12 16:40:40 -08:00 committed by GitHub
parent a5ff5cdf2f
commit 8cfe802099
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 20 additions and 18 deletions

View File

@ -1,5 +1,5 @@
diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake
index 6cf0cb66..2a9b1793 100644
index a63f3ce..aa77c20 100644
--- a/adm/cmake/cotire.cmake
+++ b/adm/cmake/cotire.cmake
@@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
@ -19,15 +19,15 @@ index 6cf0cb66..2a9b1793 100644
cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
ANDROID_API ANDROID_API_MIN ANDROID_GUI
diff --git a/adm/cmake/occt_toolkit.cmake b/adm/cmake/occt_toolkit.cmake
index 79605059..630a978e 100644
index 2f96c6f..78f15f0 100644
--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -231,7 +231,7 @@ if (EXECUTABLE_PROJECT)
@@ -235,7 +235,7 @@ if (EXECUTABLE_PROJECT)
else()
add_library (${PROJECT_NAME} ${USED_SRCFILES} ${USED_INCFILES} ${USED_RCFILE} ${RESOURCE_FILES} ${${PROJECT_NAME}_MOC_FILES})
- if (MSVC)
+ if (MSVC AND BUILD_SHARED_LIBS)
install (FILES ${CMAKE_BINARY_DIR}/${OS_WITH_BIT}/${COMPILER}/bin\${OCCT_INSTALL_BIN_LETTER}/${PROJECT_NAME}.pdb
CONFIGURATIONS Debug RelWithDebInfo
DESTINATION "${INSTALL_DIR_BIN}\${OCCT_INSTALL_BIN_LETTER}")
if (BUILD_FORCE_RelWithDebInfo)
set (aReleasePdbConf "Release")
else()

View File

@ -1,10 +1,8 @@
vcpkg_fail_port_install(ON_ARCH "arm" "arm64" ON_TARGET "UWP" "OSX" "Linux")
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO Open-Cascade-SAS/OCCT
REF 628c0211d53c7fe1036a85e7a7b2b067c9c50f7a #V7.5.0
SHA512 8d946e971417642264b318353fb34ebabf214bff5c705c60818da9e56e9cd658ed15b76b73d7207edffa398c23ad9982f4e9656b218b5edada325ca05c1283bb
REF 80ffc5f84dae96de6ed093d3e5d2466a9e368b27 #V7.6.0
SHA512 1dfee9c59eb6ea61735f0807d44ccf62019a2649f506a5a8197e04b1533592dc95d6d67ab7a3bb392785755ed60b6fc489bea049f658d4ae7d05dfe0d7d5bdcd
HEAD_REF master
PATCHES
fix-pdb-find.patch
@ -27,13 +25,13 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
# VTK option in opencascade not currently supported because only 6.1.0 is supported but vcpkg has >= 9.0
# We turn off BUILD_MODULE_Draw as it requires TCL 8.6 and TK 8.6 specifically which conflicts with vcpkg only having TCL 9.0
# And pre-built ActiveTCL binaries are behind a marketing wall :(
# We use the Unix install layout for Windows as it matches vcpkg
vcpkg_cmake_configure(
SOURCE_PATH ${SOURCE_PATH}
OPTIONS ${FEATURE_OPTIONS}
SOURCE_PATH "${SOURCE_PATH}"
OPTIONS
${FEATURE_OPTIONS}
-DBUILD_LIBRARY_TYPE=${BUILD_TYPE}
-DBUILD_MODULE_Draw=OFF
-DINSTALL_DIR_LAYOUT=Unix
@ -76,7 +74,6 @@ file(RENAME "${CURRENT_PACKAGES_DIR}/debug/libd" "${CURRENT_PACKAGES_DIR}/debug/
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
# debug creates libd and bind directories that need moving
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/bin")

View File

@ -1,8 +1,8 @@
{
"name": "opencascade",
"version-string": "7.5.0",
"port-version": 3,
"version": "7.6.0",
"description": "Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.",
"homepage": "https://github.com/Open-Cascade-SAS/OCCT",
"supports": "!(uwp | osx | linux | arm)",
"dependencies": [
"freetype",

View File

@ -4865,8 +4865,8 @@
"port-version": 0
},
"opencascade": {
"baseline": "7.5.0",
"port-version": 3
"baseline": "7.6.0",
"port-version": 0
},
"opencc": {
"baseline": "2020-04-26",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "a1f9f32c2e0778573a20d4b59fda9be37cf6134d",
"version": "7.6.0",
"port-version": 0
},
{
"git-tree": "fc0aab2d38343a9640300fb0f46c67f5313cf16c",
"version-string": "7.5.0",