From d18d9ad6627f5465b8abd62d4a700c13970fd807 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 8 Dec 2013 14:17:46 +0100 Subject: [PATCH] + Copy some more Python modules from LibPack --- CMakeLists.txt | 1 + data/examples/CMakeLists.txt | 17 ++++++++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e2b8a9986..52522be01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -162,6 +162,7 @@ if(FREECAD_LIBPACK_USE) file(GLOB FREECAD_LIBPACK_PIVY_COIN "${FREECAD_LIBPACK_DIR}/pivy/*.*") file(GLOB FREECAD_LIBPACK_PIVY_SOQT "${FREECAD_LIBPACK_DIR}/pivy/gui/*.*") file(GLOB FREECAD_LIBPACK_PYSIDE "${FREECAD_LIBPACK_DIR}/pyside/lib/site-packages/PySide/*.py*") + file(GLOB FREECAD_LIBPACK_PYTHON "${FREECAD_LIBPACK_DIR}/bin/*.py*") ELSEIF(FREECAD_LIBPACK_CHECKCUSTOM) set(FREECAD_LIBPACK_VERSION "Custom" CACHE STRING "Displays if the libpack has been found" FORCE) include(cMake/UseLibPackCustom.cmake) diff --git a/data/examples/CMakeLists.txt b/data/examples/CMakeLists.txt index 695aaa7bd..1916343b9 100644 --- a/data/examples/CMakeLists.txt +++ b/data/examples/CMakeLists.txt @@ -18,7 +18,7 @@ if(NOT "${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}") endif() if (WIN32 AND FREECAD_LIBPACK_USE) - set(FREECAD_LIBPACK_FILES ${FREECAD_LIBPACK_PIVY_COIN} ${FREECAD_LIBPACK_PIVY_SOQT} ${FREECAD_LIBPACK_PYSIDE}) + set(FREECAD_LIBPACK_FILES ${FREECAD_LIBPACK_PIVY_COIN} ${FREECAD_LIBPACK_PIVY_SOQT} ${FREECAD_LIBPACK_PYSIDE} ${FREECAD_LIBPACK_PYTHON}) add_custom_target(LibPack_Files ALL SOURCES ${FREECAD_LIBPACK_FILES}) # pivy @@ -66,6 +66,21 @@ if (WIN32 AND FREECAD_LIBPACK_USE) endforeach (it) SOURCE_GROUP("PySide" FILES ${FREECAD_LIBPACK_PYSIDE}) + # Python extension modules + foreach (it ${FREECAD_LIBPACK_PYTHON}) + get_filename_component(libfile ${it} NAME) + set(out "${CMAKE_BINARY_DIR}/DLLs/${libfile}") + add_custom_command( + DEPENDS ${it} + OUTPUT ${out} + COMMAND ${CMAKE_COMMAND} + ARGS -E copy_if_different ${it} ${out} + MAIN_DEPENDENCY ${it} + COMMENT "Copy file to ${out}" + ) + endforeach (it) + SOURCE_GROUP("Python" FILES ${FREECAD_LIBPACK_PYTHON}) + endif(WIN32 AND FREECAD_LIBPACK_USE) INSTALL(