Merge pull request #2 from PolyCam/jgibson/android-etdump-buildfix

jgibson2 · web-flow · commit 5acac1ef01e0 · 2026-04-24T11:46:44.000-04:00
Android: build/runtime fixes for modern Clang
diff --git a/tools/cmake/common/preset.cmake b/tools/cmake/common/preset.cmake
@@ -82,12 +82,12 @@ macro(define_overridable_option NAME DESCRIPTION VALUE_TYPE DEFAULT_VALUE)
   if(DEFINED ${NAME} AND NOT DEFINED CACHE{${NAME}})
     set(${NAME}
         ${${NAME}}
-        CACHE ${VALUE_TYPE} ${DESCRIPTION} FORCE
+        CACHE ${VALUE_TYPE} "${DESCRIPTION}" FORCE
     )
   else()
     set(${NAME}
         ${DEFAULT_VALUE}
-        CACHE ${VALUE_TYPE} ${DESCRIPTION}
+        CACHE ${VALUE_TYPE} "${DESCRIPTION}"
     )
   endif()
 

Original file line number	Diff line number	Diff line change
`@@ -82,12 +82,12 @@ macro(define_overridable_option NAME DESCRIPTION VALUE_TYPE DEFAULT_VALUE)`
`82`	`82`	`if(DEFINED ${NAME} AND NOT DEFINED CACHE{${NAME}})`
`83`	`83`	`set(${NAME}`
`84`	`84`	`${${NAME}}`
`85`		`- CACHE ${VALUE_TYPE} ${DESCRIPTION} FORCE`
	`85`	`+ CACHE ${VALUE_TYPE} "${DESCRIPTION}" FORCE`
`86`	`86`	`)`
`87`	`87`	`else()`
`88`	`88`	`set(${NAME}`
`89`	`89`	`${DEFAULT_VALUE}`
`90`		`- CACHE ${VALUE_TYPE} ${DESCRIPTION}`
	`90`	`+ CACHE ${VALUE_TYPE} "${DESCRIPTION}"`
`91`	`91`	`)`
`92`	`92`	`endif()`
`93`	`93`