diff options
| author | NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> | 2020-12-12 08:59:14 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 16:59:14 -0800 |
| commit | 3b935db358de1b07b83b67c6c68e0c91db9c781f (patch) | |
| tree | 87118dec7534da784c9acadbbc2e0e4a46fc18d7 | |
| parent | 234227c2b73098729a1298dd4348ef526c584fae (diff) | |
| download | vcpkg-3b935db358de1b07b83b67c6c68e0c91db9c781f.tar.gz vcpkg-3b935db358de1b07b83b67c6c68e0c91db9c781f.zip | |
[opencascade] Fix OpenCASCADE_INSTALL_PREFIX path in config (#15056)
| -rw-r--r-- | ports/opencascade/CONTROL | 2 | ||||
| -rw-r--r-- | ports/opencascade/fix-install-prefix-path.patch | 12 | ||||
| -rw-r--r-- | ports/opencascade/portfile.cmake | 1 |
3 files changed, 14 insertions, 1 deletions
diff --git a/ports/opencascade/CONTROL b/ports/opencascade/CONTROL index 7d26a2cc4..d16b19ff8 100644 --- a/ports/opencascade/CONTROL +++ b/ports/opencascade/CONTROL @@ -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) diff --git a/ports/opencascade/fix-install-prefix-path.patch b/ports/opencascade/fix-install-prefix-path.patch new file mode 100644 index 000000000..38c07c21d --- /dev/null +++ b/ports/opencascade/fix-install-prefix-path.patch @@ -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() diff --git a/ports/opencascade/portfile.cmake b/ports/opencascade/portfile.cmake index 0a8bff044..90676ada2 100644 --- a/ports/opencascade/portfile.cmake +++ b/ports/opencascade/portfile.cmake @@ -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) |