[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [35415] trunk/blender/source/creator/ CMakeLists.txt: CMake

[Campbell Barton]

Revision: 35415
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=35415
Author:   campbellbarton
Date:     2011-03-09 00:23:26 +0000 (Wed, 09 Mar 2011)
Log Message:
-----------
CMake
- temp disable installing plugins dir, since its not used for 2.5x
- OSX wasnt getting text copied.

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

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-03-08 23:12:45 UTC (rev 35414)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-03-09 00:23:26 UTC (rev 35415)
@@ -193,15 +193,6 @@
 
 if(WITH_INSTALL)
 
-	if(UNIX)
-		add_custom_command(TARGET blender
-			POST_BUILD
-			MAIN_DEPENDENCY blender
-			#COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/plugins ${TARGETDIR}/
-			#COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/
-		)
-	endif()
-
 	if(UNIX AND NOT APPLE)
 
 		if(WITH_INSTALL_PORTABLE)
@@ -295,11 +286,13 @@
 			)
 		endif()
 
-			install(
-				DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-				DESTINATION ${TARGETDIR_VER}/
-				PATTERN ".svn" EXCLUDE
-			)
+			# plugins in blender 2.5 don't work at the moment.
+			#
+			# install(
+			# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
+			# 	DESTINATION ${TARGETDIR_VER}/
+			# 	PATTERN ".svn" EXCLUDE
+			# )
 
 		if(WITH_PYTHON)
 			# install(CODE "message(\"copying blender scripts...\")")
@@ -390,11 +383,13 @@
 			PATTERN ".svn" EXCLUDE
 		)
 
-		install(  # TODO, copy to linux
-			DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
-			DESTINATION ${TARGETDIR_VER}/
-			PATTERN ".svn" EXCLUDE
-		)
+		# plugins in blender 2.5 don't work at the moment.
+		#
+		# install(
+		# 	DIRECTORY ${CMAKE_SOURCE_DIR}/release/plugins
+		# 	DESTINATION ${TARGETDIR_VER}/
+		# 	PATTERN ".svn" EXCLUDE
+		# )
 
 		if(WITH_PYTHON)
 			# install(CODE "message(\"copying blender scripts...\")")
@@ -514,12 +509,19 @@
 		endif()
 
 	elseif(APPLE)
+		# TODO, APPLE needs a 'make install' target like win32 and unix
+
 		set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
 		set(SOURCEINFO ${SOURCEDIR}/Contents/Info.plist)
 		set(TARGETINFO ${TARGETDIR}/blender.app/Contents/Info.plist)
 
 		add_custom_command(
 			TARGET blender POST_BUILD MAIN_DEPENDENCY blender
+			COMMAND cp -R ${CMAKE_SOURCE_DIR}/release/text/* ${TARGETDIR}/
+		)
+
+		add_custom_command(
+			TARGET blender POST_BUILD MAIN_DEPENDENCY blender
 			COMMAND cp -Rf ${SOURCEINFO} ${TARGETDIR}/blender.app/Contents/
 			COMMAND cp -Rf ${SOURCEDIR}/Contents/PkgInfo ${TARGETDIR}/blender.app/Contents/
 			COMMAND cp -Rf ${SOURCEDIR}/Contents/Resources ${TARGETDIR}/blender.app/Contents/