Got rid of the ignore return prefix/suffix and added shell wrapper sc…

…ripts.
pboechat · Nov 15, 2023 · c1e84e3 · c1e84e3
1 parent 08d5a7f
commit c1e84e3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/cmake/fastcg_setup.cmake b/cmake/fastcg_setup.cmake
@@ -9,14 +9,6 @@ if(NOT FASTCG_PLATFORM IN_LIST FASTCG_PLATFORMS)
 endif()
 message(STATUS "FastCG platform: ${FASTCG_PLATFORM}")
 
-if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
-    set(FASTCG_IGNORE_RETURN_PREFIX cmd /C)
-    set(FASTCG_IGNORE_RETURN_SUFFIX || exit 0)
-else()
-    set(FASTCG_IGNORE_RETURN_PREFIX sh -c)
-    set(FASTCG_IGNORE_RETURN_SUFFIX || true)
-endif()
-
 # Setup graphics system
 
 set(FASTCG_GRAPHICS_SYSTEM "OpenGL" CACHE STRING "FastCG graphics system")

diff --git a/cmake/fastcg_targets.cmake b/cmake/fastcg_targets.cmake
@@ -247,7 +247,7 @@ function(_fastcg_add_apk_targets)
     add_custom_target(
         ${ARGV0}_DEPLOY_APK
         COMMAND ${FASTCG_ADB} shell am force-stop com.fastcg.${ARGV0}
-        COMMAND ${FASTCG_IGNORE_RETURN_PREFIX} ${FASTCG_ADB} uninstall com.fastcg.${ARGV0} ${FASTCG_IGNORE_RETURN_SUFFIX}
+        COMMAND ${CMAKE_SOURCE_DIR}/shell_wrapper "${FASTCG_ADB} uninstall com.fastcg.${ARGV0}"
         COMMAND ${FASTCG_ADB} install ${DST_GRADLE_PROJECT_DIR}/app/build/outputs/apk/$<LOWER_CASE:$<CONFIG>>/${ARGV0}-$<LOWER_CASE:$<CONFIG>>.apk
         DEPENDS ${ARGV0}_BUILD_APK
     )

diff --git a/shell_wrapper.bat b/shell_wrapper.bat
@@ -0,0 +1,3 @@
+@echo off
+cmd /C %1
+exit /B 0
diff --git a/shell_wrapper.sh b/shell_wrapper.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+sh -c $1
+exit 0