[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [31691] trunk/blender/source/creator/ CMakeLists.txt: Python library copying hack.

[Nathan Letwory]

Revision: 31691
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=31691
Author:   jesterking
Date:     2010-09-01 08:19:38 +0200 (Wed, 01 Sep 2010)

Log Message:
-----------
Python library copying hack.

When creating project files the multi-configuration generator is used. CMAKE_BUILD_TYPE is then not set, so always release libs were copied.
For now copy both release and debug.

Modified Paths:
--------------
    trunk/blender/source/creator/CMakeLists.txt

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2010-09-01 05:58:33 UTC (rev 31690)
+++ trunk/blender/source/creator/CMakeLists.txt	2010-09-01 06:19:38 UTC (rev 31691)
@@ -326,21 +326,34 @@
 		ENDIF(CMAKE_CL_64)
 
 		IF(WITH_PYTHON)
-			IF(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+			MESSAGE (STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+			MESSAGE (STATUS "CMAKE_CONFIGURATION_TYPES: ${CMAKE_CONFIGURATION_TYPES}")
+			IF(NOT CMAKE_BUILD_TYPE) # hack: with multi-configuration generator this is "", so for now copy both python31.dll/zip and python31_d.dll/zip
 				ADD_CUSTOM_COMMAND(TARGET blender
 					POST_BUILD
 					MAIN_DEPENDENCY blender
 					COMMAND copy /Y \"${LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
 					COMMAND copy /Y \"${LIBDIR}\\release\\python31_d.zip\" \"${TARGETDIR}\\\"
-				)
-			ELSE(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
-				ADD_CUSTOM_COMMAND(TARGET blender
-					POST_BUILD
-					MAIN_DEPENDENCY blender
 					COMMAND copy /Y \"${LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
 					COMMAND copy /Y \"${LIBDIR}\\release\\python31.zip\" \"${TARGETDIR}\\\"
 				)
-			ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+			ELSE(NOT CMAKE_BUILD_TYPE)
+				IF(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+					ADD_CUSTOM_COMMAND(TARGET blender
+						POST_BUILD
+						MAIN_DEPENDENCY blender
+						COMMAND copy /Y \"${LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
+						COMMAND copy /Y \"${LIBDIR}\\release\\python31_d.zip\" \"${TARGETDIR}\\\"
+					)
+				ELSE(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+					ADD_CUSTOM_COMMAND(TARGET blender
+						POST_BUILD
+						MAIN_DEPENDENCY blender
+						COMMAND copy /Y \"${LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
+						COMMAND copy /Y \"${LIBDIR}\\release\\python31.zip\" \"${TARGETDIR}\\\"
+					)
+				ENDIF(CMAKE_BUILD_TYPE STREQUAL Debug OR CMAKE_BUILD_TYPE STREQUAL RelWithDebInfo)
+			ENDIF(NOT CMAKE_BUILD_TYPE)
 		ENDIF(WITH_PYTHON)
 
 		IF(WITH_INTERNATIONAL)
@@ -409,15 +422,13 @@
 		ENDIF(WITH_OPENAL)
 
 		IF(WITH_SDL)
-			IF(CMAKE_CL_64)
-				# SDL is statically linked on win64
-			ELSE(CMAKE_CL_64)
+			IF(NOT CMAKE_CL_64)
 				ADD_CUSTOM_COMMAND(TARGET blender
 					POST_BUILD
 					MAIN_DEPENDENCY blender
 					COMMAND copy /Y \"${LIBDIR}\\sdl\\lib\\SDL.dll\" \"${TARGETDIR}\\\"
 				)
-			ENDIF(CMAKE_CL_64)
+			ENDIF(NOT CMAKE_CL_64)
 		ENDIF(WITH_SDL)
 
 	ENDIF(WIN32)