blender
/
blender
134
398
Fork 578
Code Issues 6.3k Pull Requests 747 Projects 19 Wiki Activity

CMAKE disable building the windows launcher, fix type in delayloading of debug dll

This commit is contained in:
Martijn Berger 2016-03-31 14:05:38 +02:00 committed by Sergey Sharybin
parent 8efe90f0a0
commit 02081f86d1
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -1300,7 +1300,7 @@ elseif(WIN32)
set(OPENMP_DLL_NAME "vcomp140")
endif()
set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} /DELAYLOAD:${OPENMP_DLL_NAME}.dll delayimp.lib")
set(PLATFORM_LINKFLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG} /DELAYLOAD::${OPENMP_DLL_NAME}d.dll delayimp.lib")
set(PLATFORM_LINKFLAGS_DEBUG "${PLATFORM_LINKFLAGS_DEBUG} /DELAYLOAD:${OPENMP_DLL_NAME}d.dll delayimp.lib")
endif()
if(NOT DEFINED LIBDIR)

12
source/creator/CMakeLists.txt
View File

@ -1090,17 +1090,7 @@ setup_liblinks(blender)
# Setup launcher
if(WIN32 AND NOT WITH_PYTHON_MODULE)
set(LAUNCHER_SRC
creator_launch_win.c
${CMAKE_SOURCE_DIR}/release/windows/icons/winblender.rc
)
add_executable(blender-launcher ${LAUNCHER_SRC})
target_link_libraries(blender-launcher bf_intern_utfconv ${PLATFORM_LINKLIBS})
set_target_properties(blender PROPERTIES OUTPUT_NAME blender-app)
set_target_properties(blender-launcher PROPERTIES OUTPUT_NAME blender)
install(TARGETS blender blender-launcher
install(TARGETS blender
COMPONENT Blender
DESTINATION ".")