From 9eb55a0414c019db35d5f1fb5ed2067b02cd5d06 Mon Sep 17 00:00:00 2001 From: Joao Matos Date: Sat, 28 Dec 2024 20:49:36 +0000 Subject: [PATCH] CMake: Try searching for Coin3D in config mode --- cMake/FreeCAD_Helpers/SetupCoin3D.cmake | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/cMake/FreeCAD_Helpers/SetupCoin3D.cmake b/cMake/FreeCAD_Helpers/SetupCoin3D.cmake index 032b6e546f..d271ba8940 100644 --- a/cMake/FreeCAD_Helpers/SetupCoin3D.cmake +++ b/cMake/FreeCAD_Helpers/SetupCoin3D.cmake @@ -6,17 +6,19 @@ macro(SetupCoin3D) find_library(COIN3D_LIBRARIES Coin) endif () - # Try MODULE mode - find_package(Coin3D) - if (NOT COIN3D_FOUND) - # Try CONFIG mode - find_package(Coin CONFIG REQUIRED) - if (Coin_FOUND) - set(COIN3D_INCLUDE_DIRS ${Coin_INCLUDE_DIR}) - set(COIN3D_LIBRARIES ${Coin_LIBRARIES}) - set(COIN3D_LIB_DIRS ${Coin_LIB_DIR}) + # Try CONFIG mode + find_package(Coin CONFIG) + if (Coin_FOUND) + set(COIN3D_INCLUDE_DIRS ${Coin_INCLUDE_DIR}) + set(COIN3D_LIBRARIES ${Coin_LIBRARIES}) + set(COIN3D_LIB_DIRS ${Coin_LIB_DIR}) + else () + # Try MODULE mode (FindCoin3D.cmake, included by CMake) + find_package(Coin3D) + if (NOT COIN3D_FOUND) + message(FATAL_ERROR "Could not find Coin3D") endif () - ENDIF () + endif () IF (NOT COIN3D_VERSION) file(READ "${COIN3D_INCLUDE_DIRS}/Inventor/C/basic.h" _coin3d_basic_h)