mirror of
https://git.freebsd.org/ports.git
synced 2025-06-06 05:10:29 -04:00
f3c231d641
- switches opencascade to vtk9 to enable upcoming import of
cad/py-ocp
- cad/freecad has to switch vtk8 -> vtk9, too
- this requires upstream commit 0cfea3fee3e7848bbf043d2b1a19f6405d7ebe25
"Make smesh compile with vtk9"
- while touching this, fixes vtk module detection
- clean up VTK_DIR usage: that variable does not exist in FreeCAD's
build system anymore (for quite some time, actually)
Obtained from: opencascade upstream: Kirill Gavrilov
Obtained from: freecad upstream: committed by github/wwmayer
Differential Revision: D30934
Reported by: thierry@
Submitted by: thierry@
20 lines
885 B
CMake
20 lines
885 B
CMake
--- adm/cmake/occt_macros.cmake.orig 2020-11-03 14:49:43 UTC
|
|
+++ adm/cmake/occt_macros.cmake
|
|
@@ -47,7 +47,7 @@ macro (OCCT_MAKE_OS_WITH_BITNESS)
|
|
elseif(APPLE)
|
|
set (OS_WITH_BIT "mac${COMPILER_BITNESS}")
|
|
else()
|
|
- set (OS_WITH_BIT "lin${COMPILER_BITNESS}")
|
|
+ set (OS_WITH_BIT "bsd${COMPILER_BITNESS}")
|
|
endif()
|
|
endmacro()
|
|
|
|
@@ -336,7 +336,7 @@ macro (COLLECT_AND_INSTALL_OCCT_HEADER_FILES ROOT_TARG
|
|
configure_file ("${TEMPLATE_HEADER_PATH}" "${ROOT_TARGET_OCCT_DIR}/${OCCT_INSTALL_DIR_PREFIX}/${HEADER_FILE_NAME}" @ONLY)
|
|
endforeach()
|
|
|
|
- install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR}/${OCCT_INSTALL_DIR_PREFIX}")
|
|
+ install (FILES ${OCCT_HEADER_FILES_COMPLETE} DESTINATION "${INSTALL_DIR_INCLUDE}")
|
|
|
|
string(TIMESTAMP CURRENT_TIME "%H:%M:%S")
|
|
message (STATUS "Info: \(${CURRENT_TIME}\) Checking headers in inc folder...")
|