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
1.1 KiB
CMake
20 lines
1.1 KiB
CMake
--- adm/templates/OpenCASCADEConfig.cmake.in.orig 2021-06-26 15:04:30 UTC
|
|
+++ adm/templates/OpenCASCADEConfig.cmake.in
|
|
@@ -36,11 +36,11 @@ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_
|
|
endif()
|
|
|
|
# Set OpenCASCADE paths to headers, binaries, libraries, resources, tests, samples, data
|
|
-set (OpenCASCADE_BINARY_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_BIN@")
|
|
-set (OpenCASCADE_LIBRARY_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_LIB@")
|
|
-set (OpenCASCADE_SCRIPT_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_SCRIPT@")
|
|
-set (OpenCASCADE_INCLUDE_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_INCLUDE@")
|
|
-set (OpenCASCADE_RESOURCE_DIR "${OpenCASCADE_INSTALL_PREFIX}/@INSTALL_DIR_RESOURCE@")
|
|
+set (OpenCASCADE_BINARY_DIR "@INSTALL_DIR_BIN@")
|
|
+set (OpenCASCADE_LIBRARY_DIR "@INSTALL_DIR_LIB@")
|
|
+set (OpenCASCADE_SCRIPT_DIR "@INSTALL_DIR_SCRIPT@")
|
|
+set (OpenCASCADE_INCLUDE_DIR "@INSTALL_DIR_INCLUDE@")
|
|
+set (OpenCASCADE_RESOURCE_DIR "@INSTALL_DIR_RESOURCE@")
|
|
|
|
# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
|
|
set (OpenCASCADE_C_FLAGS "@CMAKE_C_FLAGS@")
|