Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cmake windows. Make sure we install blender player.

Browse Source 
Add blenderplayer component so you can speicfy to install this in the
installer
This commit is contained in:
Martijn Berger
2014-11-15 20:51:18 +01:00
parent bfa75dc990
commit a28c763b44
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
build_files/cmake/packaging.cmake
View File

@@ -71,6 +71,12 @@ if(WIN32)
set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/release/text/GPL-license.txt) 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_PRODUCT_ICON ${CMAKE_SOURCE_DIR}/source/icons/winblender.ico)
set(CPACK_WIX_UPGRADE_GUID "B767E4FD-7DE7-4094-B051-3AE62E13A17A") 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() endif()
set(CPACK_PACKAGE_EXECUTABLES "blender" "blender") set(CPACK_PACKAGE_EXECUTABLES "blender" "blender")

4
source/blenderplayer/CMakeLists.txt
View File

@@ -56,6 +56,10 @@ if(WIN32 AND NOT UNIX)
add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c ../icons/winblender.rc) add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c ../icons/winblender.rc)
install(TARGETS blenderplayer
COMPONENT Blenderplayer
DESTINATION ".")
elseif(APPLE) elseif(APPLE)
add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c) add_executable(blenderplayer ${EXETYPE} bad_level_call_stubs/stubs.c)
# setup Info.plist # setup Info.plist

2
source/creator/CMakeLists.txt
View File

@@ -963,7 +963,9 @@ if(WIN32 AND NOT WITH_PYTHON_MODULE)
set_target_properties(blender-launcher PROPERTIES OUTPUT_NAME blender) set_target_properties(blender-launcher PROPERTIES OUTPUT_NAME blender)
install(TARGETS blender blender-launcher install(TARGETS blender blender-launcher
COMPONENT Blender
DESTINATION ".") DESTINATION ".")
if(MSVC12_REDIST_DIR) if(MSVC12_REDIST_DIR)
if(CMAKE_CL_64) if(CMAKE_CL_64)
set(_WIN_PLATFORM x64) set(_WIN_PLATFORM x64)