From c5cb6695f0169c776b0f8d1bd3477a196f1758d7 Mon Sep 17 00:00:00 2001 From: Tobias Frost Date: Thu, 20 Oct 2022 21:08:48 +0100 Subject: [PATCH] Fix cmake module path Forwarded: not yet Last-Update: 2022-10-19 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) Last-Update: 2022-10-19 Gbp-Pq: Name 0010-fix-cmake-module.patch --- CMakeLists.txt | 1 + adm/templates/OpenCASCADEConfig.cmake.in | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6a034d106..3e11aaa11 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,6 +11,7 @@ IF(IGNORE_NO_ATOMICS) ADD_DEFINITIONS(-DIGNORE_NO_ATOMICS) ENDIF(IGNORE_NO_ATOMICS) +include(GNUInstallDirs) # macro: include patched file if it exists macro (OCCT_INCLUDE_CMAKE_FILE BEING_INCLUDED_FILE) diff --git a/adm/templates/OpenCASCADEConfig.cmake.in b/adm/templates/OpenCASCADEConfig.cmake.in index e391ddfe8..aa0257fa2 100644 --- a/adm/templates/OpenCASCADEConfig.cmake.in +++ b/adm/templates/OpenCASCADEConfig.cmake.in @@ -36,11 +36,11 @@ if (OpenCASCADE_INSTALL_PREFIX MATCHES "/libs/${CMAKE_ANDROID_ARCH_ABI}$") 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 @@ foreach(_comp ${OpenCASCADE_FIND_COMPONENTS}) 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() -- 2.30.2