Revision: 37019
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37019
Author: campbellbarton
Date: 2011-05-30 10:39:18 +0000 (Mon, 30 May 2011)
Log Message:
-----------
fix for cmakes windows install target, was extracting python 4 times, note
install(CODE... doesnt support CONFIGURATIONS setting.
Modified Paths:
--------------
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-05-30 10:27:45 UTC (rev
37018)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-05-30 10:39:18 UTC (rev
37019)
@@ -462,10 +462,11 @@
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,35 +491,15 @@
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
# install(CODE "execute_process(COMMAND find
${TARGETDIR}/${BLENDER_VERSION}/python/lib/ -name '*.so' -exec strip -s {}
'\;')")
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
