Browse Source

Clean up the LuaJIT build script - use normal replace in escaping vars.

Yao Wei Tjong 姚伟忠 11 years ago
parent
commit
a6a9e9891f

+ 2 - 2
Source/ThirdParty/LuaJIT/CMakeLists.txt

@@ -315,8 +315,8 @@ set (DASM_FLAGS ${DASM_XFLAGS} ${DASM_AFLAGS})
 if (CMAKE_CROSSCOMPILING OR IOS)
     # Escape the variables
     foreach (ESCAPED_VAR HOST_XCFLAGS TARGET_ARCH DASM_FLAGS DASM_ARCH)
-        string (REGEX REPLACE -D +D ${ESCAPED_VAR} "${${ESCAPED_VAR}}")
-        string (REGEX REPLACE ";" , ${ESCAPED_VAR} "${${ESCAPED_VAR}}")
+        string (REPLACE -D +D ${ESCAPED_VAR} "${${ESCAPED_VAR}}")
+        string (REPLACE ";" , ${ESCAPED_VAR} "${${ESCAPED_VAR}}")
     endforeach ()
     # When cross-compiling, build the host tool as external project
     include (ExternalProject)

+ 2 - 2
Source/ThirdParty/LuaJIT/src/host/CMakeLists.txt

@@ -53,8 +53,8 @@ elseif (NOT CMAKE_PROJECT_NAME STREQUAL Urho3D)
 
     # Unescape the variables
     foreach (ESCAPED_VAR HOST_XCFLAGS TARGET_ARCH DASM_FLAGS DASM_ARCH)
-        string (REGEX REPLACE \\+D -D ${ESCAPED_VAR} ${${ESCAPED_VAR}})
-        string (REGEX REPLACE , ";" ${ESCAPED_VAR} ${${ESCAPED_VAR}})
+        string (REPLACE +D -D ${ESCAPED_VAR} ${${ESCAPED_VAR}})
+        string (REPLACE , ";" ${ESCAPED_VAR} ${${ESCAPED_VAR}})
     endforeach ()
 endif ()