[Bf-blender-cvs] [a28c763] master: Cmake windows. Make sure we install blender player. Add blenderplayer component so you can speicfy to install this in the installer

Martijn Berger noreply at git.blender.org
Sat Nov 15 20:53:22 CET 2014


Commit: a28c763b44f761c12778f43201415135fcde49b2
Author: Martijn Berger
Date:   Sat Nov 15 20:51:18 2014 +0100
Branches: master
https://developer.blender.org/rBa28c763b44f761c12778f43201415135fcde49b2

Cmake windows. Make sure we install blender player.
Add blenderplayer component so you can speicfy to install this in the
installer

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

M	build_files/cmake/packaging.cmake
M	source/blenderplayer/CMakeLists.txt
M	source/creator/CMakeLists.txt

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

diff --git a/build_files/cmake/packaging.cmake b/build_files/cmake/packaging.cmake
index 08185d3..fbd5dad 100644
--- a/build_files/cmake/packaging.cmake
+++ b/build_files/cmake/packaging.cmake
@@ -71,6 +71,12 @@ if(WIN32)
 	set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt)
 	set(CPACK_WIX_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/source/icons/winblender.ico)
 	set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A")
+
+	set(CPACK_WIX_UI_BANNER ${LIBDIR}/package/installer_wix/WIX_UI_BANNER.bmp)
+	set(CPACK_WIX_UI_DIALOG ${LIBDIR}/package/installer_wix/WIX_UI_DIALOG.bmp)
+
+	#force lzma instead of deflate
+	set(CPACK_WIX_LIGHT_EXTRA_FLAGS -dcl:high)
 endif()
 
 set(CPACK_PACKAGE_EXECUTABLES "blender" "blender")
diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt
index 01d19be..3dba433 100644
--- a/source/blenderplayer/CMakeLists.txt
+++ b/source/blenderplayer/CMakeLists.txt
@@ -56,6 +56,10 @@ if(WIN32 AND NOT UNIX)
 
 	add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c ../icons/winblender.rc)
 
+	install(TARGETS blenderplayer
+			COMPONENT Blenderplayer
+			DESTINATION ".")
+
 elseif(APPLE)
 	add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c)
 	# setup Info.plist
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
index 6ef99d4..bb669b6 100644
--- a/source/creator/CMakeLists.txt
+++ b/source/creator/CMakeLists.txt
@@ -963,7 +963,9 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
 	set_target_properties(blender-launcher PROPERTIES OUTPUT_NAME blender)
 
 	install(TARGETS blender blender-launcher
+			COMPONENT Blender
 			DESTINATION ".")
+
 	if(MSVC12_REDIST_DIR)
 		if(CMAKE_CL_64)
 			set(_WIN_PLATFORM x64)




More information about the Bf-blender-cvs mailing list