Skip to content

Commit

Permalink
[opencascade] Update to 7.5.0 (microsoft#15997)
Browse files Browse the repository at this point in the history
* [opencascade] Update to 7.5.0

* update version
  • Loading branch information
JonLiu1993 authored Feb 3, 2021
1 parent d316fd1 commit 0c32fc5
Show file tree
Hide file tree
Showing 9 changed files with 44 additions and 133 deletions.
3 changes: 1 addition & 2 deletions ports/opencascade/CONTROL
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
Source: opencascade
Version: 7.4.0
Port-Version: 3
Version: 7.5.0
Build-Depends: freetype
Description: Open CASCADE Technology (OCCT) is an open-source software development platform for 3D CAD, CAM, CAE.
Supports: !(uwp|osx|linux|arm)
Expand Down
13 changes: 0 additions & 13 deletions ports/opencascade/fix-build-with-vs2017.patch

This file was deleted.

12 changes: 0 additions & 12 deletions ports/opencascade/fix-install-prefix-path.patch

This file was deleted.

22 changes: 0 additions & 22 deletions ports/opencascade/fix-msvc-32bit-builds.patch

This file was deleted.

33 changes: 33 additions & 0 deletions ports/opencascade/fix-pdb-find.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
diff --git a/adm/cmake/cotire.cmake b/adm/cmake/cotire.cmake
index 6cf0cb66..2a9b1793 100644
--- a/adm/cmake/cotire.cmake
+++ b/adm/cmake/cotire.cmake
@@ -3114,6 +3114,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
OSX_ARCHITECTURES OSX_ARCHITECTURES_<CONFIG> PRIVATE_HEADER PUBLIC_HEADER RESOURCE XCTEST
IOS_INSTALL_COMBINED)
# copy Windows platform specific stuff
+ if (BUILD_SHARED_LIBS)
cotire_copy_set_properites("${_configurations}" TARGET ${_target} ${_unityTargetName}
GNUtoMS
COMPILE_PDB_NAME COMPILE_PDB_NAME_<CONFIG>
@@ -3129,6 +3130,7 @@ function (cotire_setup_unity_build_target _languages _configurations _target)
WIN32_EXECUTABLE WINDOWS_EXPORT_ALL_SYMBOLS
DEPLOYMENT_REMOTE_DIRECTORY VS_CONFIGURATION_TYPE
VS_SDK_REFERENCES)
+ endif()
# copy Android platform specific stuff
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
--- a/adm/cmake/occt_toolkit.cmake
+++ b/adm/cmake/occt_toolkit.cmake
@@ -231,7 +231,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}")
76 changes: 0 additions & 76 deletions ports/opencascade/fix-static-build.patch

This file was deleted.

9 changes: 3 additions & 6 deletions ports/opencascade/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,11 @@ 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 V7_4_0
SHA512 595ad7226b9365c1a7670b77001f71787a5d8aaa4a93a4a4d8eb938564670d79ae5a247ae7cc770b5da53c9a9f2e4166ba6e5ae104c1f2debad19ec2187f4a56
REF 628c0211d53c7fe1036a85e7a7b2b067c9c50f7a #V7.5.0
SHA512 8d946e971417642264b318353fb34ebabf214bff5c705c60818da9e56e9cd658ed15b76b73d7207edffa398c23ad9982f4e9656b218b5edada325ca05c1283bb
HEAD_REF master
PATCHES
fix-msvc-32bit-builds.patch
fix-build-with-vs2017.patch
fix-static-build.patch
fix-install-prefix-path.patch
fix-pdb-find.patch
)

if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -4209,8 +4209,8 @@
"port-version": 0
},
"opencascade": {
"baseline": "7.4.0",
"port-version": 3
"baseline": "7.5.0",
"port-version": 0
},
"opencc": {
"baseline": "2020-04-26",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/opencascade.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "0d003408ab69f77a4ca2c02de115087c87a46b27",
"version-string": "7.5.0",
"port-version": 0
},
{
"git-tree": "dc198546c1a39fc3a26f7fae34f1ca97afa94f32",
"version-string": "7.4.0",
Expand Down

0 comments on commit 0c32fc5

Please sign in to comment.