Fix build error on macOS when copying resources to bundle in standalo…

…ne SDK build.
ultralight-ux · Dec 16, 2020 · adcae14 · adcae14
1 parent ce24902
commit adcae14
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/samples/Sample 7 - OpenGL Integration/CMakeLists.txt b/samples/Sample 7 - OpenGL Integration/CMakeLists.txt
@@ -49,3 +49,14 @@ endif ()
 # Copy assets to assets path
 add_custom_command(TARGET ${APP_NAME} POST_BUILD
 COMMAND ${CMAKE_COMMAND} -E copy_directory "${CMAKE_CURRENT_SOURCE_DIR}/assets/" "${ASSETS_PATH}")
+
+if (APPLE)
+  # Copy resources to resources directory
+  add_custom_command(TARGET ${APP_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${ULTRALIGHT_BINARY_DIR}/resources/" "$<TARGET_FILE_DIR:${APP_NAME}>/../Resources/resources")
+
+  # Resources directory is also copied to target directory in the "Copy all binaries" step.
+  # Remove this duplicate directory.
+  add_custom_command(TARGET ${APP_NAME} POST_BUILD
+    COMMAND ${CMAKE_COMMAND} -E remove_directory "$<TARGET_FILE_DIR:${APP_NAME}>/resources")
+endif ()
diff --git a/samples/Sample 8 - Web Browser/CMakeLists.txt b/samples/Sample 8 - Web Browser/CMakeLists.txt
@@ -44,7 +44,7 @@ add_custom_command(TARGET ${APP_NAME} POST_BUILD
 if (APPLE)
   # Copy resources to resources directory
   add_custom_command(TARGET ${APP_NAME} POST_BUILD
-    COMMAND ${CMAKE_COMMAND} -E copy_directory "${WEBCORE_DIR}/bin/resources/" "$<TARGET_FILE_DIR:${APP_NAME}>/../Resources/resources")
+    COMMAND ${CMAKE_COMMAND} -E copy_directory "${ULTRALIGHT_BINARY_DIR}/resources/" "$<TARGET_FILE_DIR:${APP_NAME}>/../Resources/resources")
 
   # Resources directory is also copied to target directory in the "Copy all binaries" step.
   # Remove this duplicate directory.