sync with upstream

1 files changed, 9 insertions, 2 deletions

diff --git a/cmake/scripts/darwin_embedded/ExtraTargets.cmake b/cmake/scripts/darwin_embedded/ExtraTargets.cmake
index 2b9980a..01ab632 100644
--- a/cmake/scripts/darwin_embedded/ExtraTargets.cmake
+++ b/cmake/scripts/darwin_embedded/ExtraTargets.cmake
@@ -7,9 +7,11 @@ if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
   set(ENTITLEMENTS_OUT_PATH "${CMAKE_BINARY_DIR}/CMakeFiles/${TOPSHELF_EXTENSION_NAME}.dir/TopShelf.entitlements")
 
   set(SOURCES
-        ${TOPSHELF_DIR}/ServiceProvider.m
-        ${TOPSHELF_DIR}/../tvosShared.m)
+        ${TOPSHELF_DIR}/../../ios-common/DarwinEmbedUtils.mm
+        ${TOPSHELF_DIR}/ServiceProvider.mm
+        ${TOPSHELF_DIR}/../tvosShared.mm)
   set(HEADERS
+        ${TOPSHELF_DIR}/../../ios-common/DarwinEmbedUtils.h
         ${TOPSHELF_DIR}/ServiceProvider.h
         ${TOPSHELF_DIR}/../tvosShared.h)
   add_executable(${TOPSHELF_EXTENSION_NAME} MACOSX_BUNDLE ${SOURCES} ${HEADERS})
@@ -21,5 +23,10 @@ if(CORE_PLATFORM_NAME_LC STREQUAL tvos)
                                                               XCODE_ATTRIBUTE_CODE_SIGN_ENTITLEMENTS ${ENTITLEMENTS_OUT_PATH})
   target_link_libraries(${TOPSHELF_EXTENSION_NAME} "-framework TVServices" "-framework Foundation")
 
+  add_custom_command(TARGET ${TOPSHELF_EXTENSION_NAME} POST_BUILD
+    COMMAND "NATIVEPREFIX=${NATIVEPREFIX}"
+            ${CMAKE_SOURCE_DIR}/tools/darwin/Support/Codesign-topshelf.command
+  )
+
   add_dependencies(${APP_NAME_LC} ${TOPSHELF_EXTENSION_NAME})
 endif()