From b92e6985cf4f8696a782d5c4ae4a5c8c119818a5 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Mon, 30 May 2011 10:39:18 +0000 Subject: [PATCH] fix for cmakes windows install target, was extracting python 4 times, note install(CODE... doesnt support CONFIGURATIONS setting. --- source/creator/CMakeLists.txt | 43 ++++++++++------------------------- 1 file changed, 12 insertions(+), 31 deletions(-) diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index aea48d88b47..6a701129fd1 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -462,10 +462,11 @@ elseif(WIN32) PATTERN "__pycache__" EXCLUDE ) - # TODO, multiple targets? - install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR} CONFIGURATIONS Release) - install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR} CONFIGURATIONS RelWithDebInfo) - install(FILES ${LIBDIR}/python/lib/python32.dll DESTINATION ${TARGETDIR} CONFIGURATIONS MinSizeRel) + install( + FILES ${LIBDIR}/python/lib/python32.dll + DESTINATION ${TARGETDIR} + CONFIGURATIONS Release;RelWithDebInfo;MinSizeRel + ) install( FILES ${LIBDIR}/python/lib/python32_d.dll @@ -490,34 +491,14 @@ elseif(WIN32) install( CODE " - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\" - \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") + if(\"\${CMAKE_INSTALL_CONFIG_NAME}\" STREQUAL \"Debug\") + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\" + \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\") + else() + execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\" + \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") + endif() " - CONFIGURATIONS Release - ) - install( - CODE - " - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\" - \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") - " - CONFIGURATIONS RelWithDebInfo - ) - install( - CODE - " - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\" - \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32.tar.gz\") - " - CONFIGURATIONS MinSizeRel - ) - install( - CODE - " - execute_process(COMMAND \"${CMAKE_COMMAND}\" -E chdir \"${TARGETDIR_VER}/python/lib\" - \"${CMAKE_COMMAND}\" -E tar xzfv \"${LIBDIR}/release/python32_d.tar.gz\") - " - CONFIGURATIONS Debug ) # doesnt work, todo