[Bf-blender-cvs] [72aa0eb] master: Fix cmake install of blenderplayer for linux.

Antony Riakiotakis noreply at git.blender.org
Thu Nov 13 13:37:36 CET 2014


Commit: 72aa0ebe6a21da996bced14e415601c22e7ca774
Author: Antony Riakiotakis
Date:   Thu Nov 13 13:37:27 2014 +0100
Branches: master
https://developer.blender.org/rB72aa0ebe6a21da996bced14e415601c22e7ca774

Fix cmake install of blenderplayer for linux.

===================================================================

M	source/blenderplayer/CMakeLists.txt
M	source/creator/CMakeLists.txt

===================================================================

diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index c48578c..01d19be 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -69,6 +69,13 @@ elseif(APPLE)
 
 else()
 	add_executable(blenderplayer bad_level_call_stubs/stubs.c)
+
+	if(NOT WITH_INSTALL_PORTABLE)
+		install(
+			TARGETS blenderplayer
+			DESTINATION bin
+		)
+	endif()
 endif()
 
 add_dependencies(blenderplayer makesdna)
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 40dd954..7fcba4d 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -451,14 +451,6 @@ if(UNIX AND NOT APPLE)
 			)
 		endif()
 
-
-		if(WITH_GAMEENGINE AND WITH_PLAYER)
-			install(
-				TARGETS blenderplayer
-				DESTINATION bin
-			)
-		endif()
-
 		# misc files
 		install(
 			FILES ${CMAKE_SOURCE_DIR}/release/freedesktop/blender.desktop




More information about the Bf-blender-cvs mailing list