Global
/
vcpkg
mirror of https://github.com/microsoft/vcpkg.git
1
0
Fork 0
Code Activity

[opencascade] Fix OpenCASCADE_INSTALL_PREFIX path in config (#15056)

This commit is contained in:
NancyLi1013 2020-12-12 08:59:14 +08:00 committed by GitHub
parent 234227c2b7
commit 3b935db358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/opencascade/CONTROL
View File

@ -1,6 +1,6 @@
Source: opencascade
Version: 7.4.0
Port-Version: 2
Port-Version: 3
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)

12
ports/opencascade/fix-install-prefix-path.patch Normal file
View File

@ -0,0 +1,12 @@
diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in
index 4937103b..cd35e07d 100644
--- a/adm/templates/OpenCASCADEConfig.cmake.in
+++ b/adm/templates/OpenCASCADEConfig.cmake.in
@@ -23,6 +23,7 @@ set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@")
# - in Windows style: $INSTALL_DIR/cmake
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${CMAKE_CURRENT_LIST_FILE}" PATH)
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
+get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$")
get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH)
endif()

1
ports/opencascade/portfile.cmake
View File

@ -10,6 +10,7 @@ vcpkg_from_github(
fix-msvc-32bit-builds.patch
fix-build-with-vs2017.patch
fix-static-build.patch
fix-install-prefix-path.patch
)
if (VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)