bcarrella
/
cef
mirror of https://bitbucket.org/chromiumembedded/cef
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Mac: Fix resource copy when building the binary distrib with Ninja (issue #1632)

This commit is contained in:
Marshall Greenblatt 2016-11-18 13:32:52 -05:00
parent bd9a2c8069
commit 258c588b44
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/cefclient/CMakeLists.txt.in
View File

@ -217,7 +217,12 @@ if(OS_MACOSX)
if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
# Manually process and copy over resource files.
# The Xcode generator handles this via the set_target_properties RESOURCE directive.
set(PREFIXES "resources/mac/" "resources/") # Remove these prefixes from input file paths.
# Remove these prefixes from input file paths.
set(PREFIXES
"resources/mac/"
"resources/"
"../shared/resources/"
)
COPY_MACOSX_RESOURCES("${CEFCLIENT_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
endif()
endif()

6
tests/ceftests/CMakeLists.txt.in
View File

@ -153,7 +153,11 @@ if(OS_MACOSX)
if(NOT ${CMAKE_GENERATOR} STREQUAL "Xcode")
# Manually process and copy over resource files.
# The Xcode generator handles this via the set_target_properties RESOURCE directive.
set(PREFIXES "mac/") # Remove these prefixes from input file paths.
# Remove these prefixes from input file paths.
set(PREFIXES
"resources/mac/"
"../shared/resources/"
)
COPY_MACOSX_RESOURCES("${UNITTESTS_RESOURCES_SRCS}" "${PREFIXES}" "${CEF_TARGET}" "${CMAKE_CURRENT_SOURCE_DIR}" "${CEF_APP}")
endif()
endif()