Merge pull request #142 from ProtonMail/fix-windows-static-copy

Fix windows static copy
This commit is contained in:
Pietro Gagliardi 2016-06-15 11:54:27 -04:00 committed by GitHub
commit e75b9cc4fa
1 changed files with 1 additions and 6 deletions

View File

@ -68,16 +68,11 @@ if(NOT BUILD_SHARED_LIBS)
set(_LIBUI_STATIC_RES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libui.res PARENT_SCOPE) set(_LIBUI_STATIC_RES ${CMAKE_ARCHIVE_OUTPUT_DIRECTORY}/libui.res PARENT_SCOPE)
endif() endif()
macro(_handle_static) macro(_handle_static)
if(MSVC)
set(_res_suffix res)
else()
set(_res_suffix obj)
endif()
# TODO this full path feels hacky # TODO this full path feels hacky
add_custom_command( add_custom_command(
TARGET libui POST_BUILD TARGET libui POST_BUILD
COMMAND COMMAND
${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:libui,BINARY_DIR>/CMakeFiles/libui.dir/windows/resources.rc.${_res_suffix} ${_LIBUI_STATIC_RES} ${CMAKE_COMMAND} -E copy $<TARGET_PROPERTY:libui,BINARY_DIR>/CMakeFiles/libui.dir/windows/resources.rc.* ${_LIBUI_STATIC_RES}
COMMENT "Copying libui.res") COMMENT "Copying libui.res")
set(_res_suffix) set(_res_suffix)
endmacro() endmacro()