From b68dfbaf6da80cb07216232dc208882cb07a9a59 Mon Sep 17 00:00:00 2001 From: Chris Hennes Date: Sun, 23 Feb 2025 22:49:33 -0600 Subject: [PATCH] CMake: Support building 1.0 with LibPack 3.1.0 --- cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake | 4 +++- cMake/UseLibPack3.cmake | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake b/cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake index baa64eb368..223ad95dcf 100644 --- a/cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake +++ b/cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake @@ -15,7 +15,9 @@ macro(CopyLibpackDirectories) if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0") file(COPY ${FREECAD_LIBPACK_DIR}/plugins/tls DESTINATION ${CMAKE_BINARY_DIR}/bin) endif() - file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR}) + if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0" AND FREECAD_LIBPACK_VERSION VERSION_LESS "3.1.0") + file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR}) + endif() message(STATUS "... end copying.\n=======================================\n") endif() diff --git a/cMake/UseLibPack3.cmake b/cMake/UseLibPack3.cmake index 7e760df3c5..727140d16d 100644 --- a/cMake/UseLibPack3.cmake +++ b/cMake/UseLibPack3.cmake @@ -15,6 +15,12 @@ set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/swig.exe CACHE FILEPATH "Swig" FO find_package(Qt6 REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/lib/cmake NO_DEFAULT_PATH) message(STATUS "Found LibPack 3 Qt ${Qt6_VERSION}") +if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.1.0") + find_package(pybind11 REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/share/cmake/pybind11 NO_DEFAULT_PATH) + message(STATUS "Found LibPack 3 pybind11 ${pybind11_VERSION}") + set(FREECAD_USE_PYBIND11 ON) +endif() + find_package(XercesC REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/cmake NO_DEFAULT_PATH) message(STATUS "Found LibPack 3 XercesC ${XercesC_VERSION}")