Skip to content

Commit 6321b80

Browse files
committed
CMake: Support building 1.0 with LibPack 3.1.0
1 parent 7e08681 commit 6321b80

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

cMake/FreeCAD_Helpers/CopyLibpackDirectories.cmake

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,9 @@ macro(CopyLibpackDirectories)
1515
if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0")
1616
file(COPY ${FREECAD_LIBPACK_DIR}/plugins/tls DESTINATION ${CMAKE_BINARY_DIR}/bin)
1717
endif()
18-
file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
18+
if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.0.0" AND FREECAD_LIBPACK_VERSION VERSION_LESS "3.1.0")
19+
file(COPY ${FREECAD_LIBPACK_DIR}/resources DESTINATION ${CMAKE_BINARY_DIR})
20+
endif()
1921
message(STATUS "... end copying.\n=======================================\n")
2022
endif()
2123

cMake/UseLibPack3.cmake

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,12 @@ set(SWIG_EXECUTABLE ${FREECAD_LIBPACK_DIR}/bin/swig.exe CACHE FILEPATH "Swig" FO
1515
find_package(Qt6 REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/lib/cmake NO_DEFAULT_PATH)
1616
message(STATUS "Found LibPack 3 Qt ${Qt6_VERSION}")
1717

18+
if(FREECAD_LIBPACK_VERSION VERSION_GREATER_EQUAL "3.1.0")
19+
find_package(pybind11 REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/share/cmake/pybind11 NO_DEFAULT_PATH)
20+
message(STATUS "Found LibPack 3 pybind11 ${pybind11_VERSION}")
21+
set(FREECAD_USE_PYBIND11 ON)
22+
endif()
23+
1824
find_package(XercesC REQUIRED PATHS ${FREECAD_LIBPACK_DIR}/cmake NO_DEFAULT_PATH)
1925
message(STATUS "Found LibPack 3 XercesC ${XercesC_VERSION}")
2026

0 commit comments

Comments
 (0)