From 24337bde72b2667c4288b5215037933aafb1e54c Mon Sep 17 00:00:00 2001 From: NancyLi1013 Date: Thu, 10 Dec 2020 17:55:44 -0800 Subject: [PATCH] [opencascade] Fix OpenCASCADE_INSTALL_PREFIX path in config --- ports/opencascade/CONTROL | 2 +- ports/opencascade/fix-install-prefix-path.patch | 12 ++++++++++++ ports/opencascade/portfile.cmake | 1 + 3 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 ports/opencascade/fix-install-prefix-path.patch diff --git a/ports/opencascade/CONTROL b/ports/opencascade/CONTROL index 7d26a2cc495a5f..d16b19ff84ee7c 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 00000000000000..38c07c21da3172 --- /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 0a8bff0447a499..90676ada2b4dd1 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)