1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Description: Fix cmake module path
to be able to install cmake module in mulipath. Also, do not bail out if an
opencascade component is not installed in the cmake module (it might be in a
different package)
Author: Tobias Frost <tobi@debian.org>
Forwarded: not yet
Last-Update: 2022-10-19 <YYYY-MM-DD, last update of the meta-information, optional>
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1196,6 +1196,7 @@
OCCT_INSTALL_FILE_OR_DIR ("samples/OCCTOverview/code/Viewer3dSamples.cxx" "${INSTALL_DIR_SAMPLES}/OCCTOverview/code")
endif()
+include(GNUInstallDirs)
# patch installed DrawDefault file if BUILD_SHARED_LIBRARY_NAME_POSTFIX is changed
if (NOT "${BUILD_SHARED_LIBRARY_NAME_POSTFIX}" STREQUAL "")
--- a/adm/templates/OpenCASCADEConfig.cmake.in
+++ b/adm/templates/OpenCASCADEConfig.cmake.in
@@ -36,11 +36,11 @@
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 "@CMAKE_INSTALL_FULL_BINDIR@")
+set (OpenCASCADE_LIBRARY_DIR "@CMAKE_INSTALL_FULL_LIBDIR@")
+set (OpenCASCADE_SCRIPT_DIR "@CMAKE_INSTALL_FULL_BINDIR@")
+set (OpenCASCADE_INCLUDE_DIR "@CMAKE_INSTALL_FULL_INCLUDEDIR@/opencascade")
+set (OpenCASCADE_RESOURCE_DIR "@CMAKE_INSTALL_FULL_DATAROOTDIR@/opencascade/resources")
# The C and C++ flags added by OpenCASCADE to the cmake-configured flags.
set (OpenCASCADE_C_FLAGS "@CMAKE_C_FLAGS@")
@@ -89,6 +89,6 @@
message (ERROR ": ${OpenCASCADE_NOTFOUND_MESSAGE}")
endif()
else()
- include("${CMAKE_CURRENT_LIST_DIR}/OpenCASCADE${_comp}Targets.cmake")
+ include("${CMAKE_CURRENT_LIST_DIR}/OpenCASCADE${_comp}Targets.cmake" OPTIONAL)
endif()
endforeach()
|
