openbsd-baikal
/
openbsd-ports
mirror of https://github.com/openbsd/ports
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix variable substitution in shipped .cmake files to unbreak consumers 

${OCCT_INSTALL_BIN_LETTER} would remain as-is and make FreeCAD unhappy.

From Johannes Thyssen Tishman, thanks!
master
kn 2023-09-04 12:39:14 +00:00
parent 0ad0631cfa
commit 10e0b1fc7d
2 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cad/oce/Makefile
View File

@ -7,7 +7,7 @@ GH_ACCOUNT = tpaviot
GH_PROJECT = oce
GH_COMMIT = 98a788062f0f30593880b0df1bcf967408212ba4
DISTNAME = oce-7.6.0
REVISION = 1
REVISION = 2
.for LIB in TKBO TKBRep TKBin TKBinL TKBinTObj TKBinXCAF TKBool TKCAF TKCDF \
TKDCAF TKDraw TKFeat TKFillet TKG2d TKG3d TKGeomAlgo TKGeomBase TKHLR \

7
cad/oce/patches/patch-adm_cmake_occt_macros_cmake
View File

@ -1,15 +1,12 @@
Ugly hack on ALL_OCCT_TARGET_FILES: change later
Index: adm/cmake/occt_macros.cmake
--- adm/cmake/occt_macros.cmake.orig
+++ adm/cmake/occt_macros.cmake
@@ -592,7 +592,8 @@ macro (OCCT_UPDATE_TARGET_FILE)
@@ -592,7 +592,7 @@ macro (OCCT_UPDATE_TARGET_FILE)
"cmake_policy(PUSH)
cmake_policy(SET CMP0007 NEW)
string (TOLOWER \"\${CMAKE_INSTALL_CONFIG_NAME}\" CMAKE_INSTALL_CONFIG_NAME_LOWERCASE)
- file (GLOB ALL_OCCT_TARGET_FILES \"${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+ file (GLOB ALL_OCCT_TARGET_FILES
+ \"${PROJECT_BINARY_DIR}/CMakeFiles/Export/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
+ file (GLOB ALL_OCCT_TARGET_FILES \"\$ENV{DESTDIR}${INSTALL_DIR}/${INSTALL_DIR_CMAKE}/OpenCASCADE*Targets-\${CMAKE_INSTALL_CONFIG_NAME_LOWERCASE}.cmake\")
foreach(TARGET_FILENAME \${ALL_OCCT_TARGET_FILES})
file (STRINGS \"\${TARGET_FILENAME}\" TARGET_FILE_CONTENT)
file (REMOVE \"\${TARGET_FILENAME}\")