From 303614e57ab6ec048ed2fbaec8de7abff8996ea0 Mon Sep 17 00:00:00 2001 From: wmayer Date: Tue, 21 Jan 2014 11:28:58 +0100 Subject: [PATCH] + Copy shiboken files from LibPack --- CMakeLists.txt | 1 + data/examples/CMakeLists.txt | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index b5134c3a6..c81442d4a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -191,6 +191,7 @@ if(FREECAD_LIBPACK_USE) set(FREECAD_LIBPACK_PYSIDEUIC_REL "${FREECAD_LIBPACK_DIR}/pyside-tools/Lib/site-packages") 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_SHIBOKEN "${FREECAD_LIBPACK_DIR}/shiboken-1.2.1/lib/site-packages/*.pyd") file(GLOB FREECAD_LIBPACK_PYSIDE "${FREECAD_LIBPACK_DIR}/pyside/lib/site-packages/PySide/*.py*") file(GLOB_RECURSE FREECAD_LIBPACK_PYSIDEUIC RELATIVE "${FREECAD_LIBPACK_PYSIDEUIC_REL}" "${FREECAD_LIBPACK_PYSIDEUIC_REL}/pysideuic/*.py") file(GLOB FREECAD_LIBPACK_PYTHON "${FREECAD_LIBPACK_DIR}/bin/*.py*") diff --git a/data/examples/CMakeLists.txt b/data/examples/CMakeLists.txt index 01d1c92be..91cd37726 100644 --- a/data/examples/CMakeLists.txt +++ b/data/examples/CMakeLists.txt @@ -48,6 +48,21 @@ if (WIN32 AND FREECAD_LIBPACK_USE) endforeach (it) SOURCE_GROUP("pivy\\gui" FILES ${FREECAD_LIBPACK_PIVY_SOQT}) + # shiboken + foreach (it ${FREECAD_LIBPACK_SHIBOKEN}) + get_filename_component(libfile ${it} NAME) + set(out "${CMAKE_BINARY_DIR}/lib/${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("Shiboken" FILES ${FREECAD_LIBPACK_SHIBOKEN}) + # PySide foreach (it ${FREECAD_LIBPACK_PYSIDE}) get_filename_component(libfile ${it} NAME) @@ -116,6 +131,7 @@ if (WIN32 AND FREECAD_LIBPACK_USE) set(FREECAD_LIBPACK_FILES ${FREECAD_LIBPACK_PIVY_COIN} ${FREECAD_LIBPACK_PIVY_SOQT} + ${FREECAD_LIBPACK_SHIBOKEN} ${FREECAD_LIBPACK_PYSIDE} ${FREECAD_LIBPACK_PYSIDEUIC_ABS} ${FREECAD_LIBPACK_PYTHON}