[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36877] trunk/blender/source/creator/ CMakeLists.txt: cmake' s install target now works for the python module on *nix.

Campbell Barton ideasman42 at gmail.com
Tue May 24 20:34:07 CEST 2011


Revision: 36877
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36877
Author:   campbellbarton
Date:     2011-05-24 18:34:07 +0000 (Tue, 24 May 2011)
Log Message:
-----------
cmake's install target now works for the python module on *nix.

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

Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt	2011-05-24 18:06:12 UTC (rev 36876)
+++ trunk/blender/source/creator/CMakeLists.txt	2011-05-24 18:34:07 UTC (rev 36877)
@@ -233,7 +233,11 @@
 	if(WITH_INSTALL_PORTABLE)
 		set(TARGETDIR_VER ${TARGETDIR}/${BLENDER_VERSION})
 	else()
-		set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
+		if(WITH_PYTHON_MODULE)
+			set(TARGETDIR_VER ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages/${BLENDER_VERSION})
+		else()
+			set(TARGETDIR_VER ${CMAKE_INSTALL_PREFIX}/share/blender/${BLENDER_VERSION})
+		endif()
 	endif()
 
 	# important to make a clean  install each time
@@ -273,11 +277,26 @@
 
 	else()
 		# main blender binary
-		install(
-			PROGRAMS ${TARGETDIR}/blender
-			DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
-		)
+		if(WITH_PYTHON_MODULE)
+			get_target_property(_module_name blender OUTPUT_NAME)
+			if(NOT _module_suffix)
+				set(_module_suffix "${SUFFIX}")
+			endif()
 
+			install(
+				PROGRAMS "${TARGETDIR}/${_module_name}.so"  # XXX, *nix only
+				DESTINATION ${PYTHON_LIBPATH}/python${PYTHON_VERSION}/site-packages
+			)
+
+			unset(_module_name)
+		else()
+			install(
+				PROGRAMS ${TARGETDIR}/blender
+				DESTINATION ${CMAKE_INSTALL_PREFIX}/bin
+			)
+		endif()
+
+
 		if(WITH_GAMEENGINE AND WITH_PLAYER)
 			install(
 				PROGRAMS ${TARGETDIR}/blenderplayer




More information about the Bf-blender-cvs mailing list