diff options
| author |   Bernd Waibel <waebbl-gentoo@posteo.net> | 2021-02-09 22:20:39 +0100 |
|---|---|---|
| committer |   Joonas Niilola <juippis@gentoo.org> | 2021-02-18 11:36:11 +0200 |
| commit | 3a529685c95f6c74ed4b46d4c7501373b0a55769 (patch) | |
| tree | 6ac702e2bf3f6796304a0ac7c01fc9bfbaf8e531 /sci-libs/opencascade/files | |
| parent | kernel-build.eclass: Use python (diff) | |
| download | gentoo-3a529685c95f6c74ed4b46d4c7501373b0a55769.tar.gz gentoo-3a529685c95f6c74ed4b46d4c7501373b0a55769.tar.bz2 gentoo-3a529685c95f6c74ed4b46d4c7501373b0a55769.zip | |
sci-libs/opencascade: fix paths in cmake config
Thanks to Fabio Rossi for reporting the issue.
See also upstream bug at
https://tracker.dev.opencascade.org/view.php?id=32035
Closes: https://bugs.gentoo.org/763162
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>
Diffstat (limited to 'sci-libs/opencascade/files')
| -rw-r--r-- | sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch new file mode 100644 index 000000000000..aacb642019ff --- /dev/null +++ b/sci-libs/opencascade/files/opencascade-7.4.0-fix-issue-with-cmake-path-variables.patch @@ -0,0 +1,41 @@ +From cefaa5bddedcb90a06d6ef8f0837a11619e5d87e Mon Sep 17 00:00:00 2001 +From: Bernd Waibel <waebbl-gentoo@posteo.net> +Date: Tue, 9 Feb 2021 20:58:43 +0100 +Subject: [PATCH] fix issue with cmake path variables + +Thanks to Fabio Rossi for reporting the issue. +Upstream bug: https://tracker.dev.opencascade.org/view.php?id=32035 + +Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net> +--- + adm/templates/OpenCASCADEConfig.cmake.in | 14 +------------- + 1 file changed, 1 insertion(+), 13 deletions(-) + +diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in +index 4937103b..db99a8d1 100644 +--- a/adm/templates/OpenCASCADEConfig.cmake.in ++++ b/adm/templates/OpenCASCADEConfig.cmake.in +@@ -16,19 +16,7 @@ set (OpenCASCADE_MINOR_VERSION "@OCC_VERSION_MINOR@") + set (OpenCASCADE_MAINTENANCE_VERSION "@OCC_VERSION_MAINTENANCE@") + set (OpenCASCADE_DEVELOPMENT_VERSION "@OCC_VERSION_DEVELOPMENT@") + +-# Compute the installation prefix from this OpenCASCADEConfig.cmake file +-# location, by going up one level + one level if "cmake" + one level if "lib". +-# This is made to support different locations of CMake files: +-# - in UNIX style: $INSTALL_DIR/lib/cmake/opencascade-<version> +-# - 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) +-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/cmake$") +- get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) +-endif() +-if (OpenCASCADE_INSTALL_PREFIX MATCHES "/lib$") +- get_filename_component (OpenCASCADE_INSTALL_PREFIX "${OpenCASCADE_INSTALL_PREFIX}" PATH) +-endif() ++set (OpenCASCADE_INSTALL_PREFIX "$ENV{CASROOT}") + + # Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data + set (OpenCASCADE_BINARY_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@") +-- +2.30.0 + |