diff --git a/cmake/prebuild.cmake b/cmake/prebuild.cmake index 3cca22743..6d37027a9 100644 --- a/cmake/prebuild.cmake +++ b/cmake/prebuild.cmake @@ -1323,23 +1323,23 @@ else(NOT CMAKE_CROSSCOMPILING) set(GETARCH_DIR "${PROJECT_BINARY_DIR}/getarch_build") set(GETARCH_BIN "getarch${CMAKE_EXECUTABLE_SUFFIX}") - file(MAKE_DIRECTORY ${GETARCH_DIR}) - configure_file(${TARGET_CONF_TEMP} ${GETARCH_DIR}/${TARGET_CONF} COPYONLY) + file(MAKE_DIRECTORY "${GETARCH_DIR}") + configure_file("${TARGET_CONF_TEMP}" "${GETARCH_DIR}/${TARGET_CONF}" COPYONLY) if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") if (CMAKE_ASM_COMPILER_ID STREQUAL "") - try_compile(GETARCH_RESULT ${GETARCH_DIR} + try_compile(GETARCH_RESULT "${GETARCH_DIR}" SOURCES ${GETARCH_SRC} CMAKE_FLAGS "-DCMAKE_ASM_COMPILER=${CMAKE_C_COMPILER}" COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" OUTPUT_VARIABLE GETARCH_LOG - COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} + COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" ) else() - try_compile(GETARCH_RESULT ${GETARCH_DIR} + try_compile(GETARCH_RESULT "${GETARCH_DIR}" SOURCES ${GETARCH_SRC} COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} -I"${GETARCH_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" OUTPUT_VARIABLE GETARCH_LOG - COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH_BIN} + COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" ) endif() if (NOT ${GETARCH_RESULT}) @@ -1370,19 +1370,19 @@ execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}") # append config data from getarch to the TARGET file and read in CMake vars - file(APPEND ${TARGET_CONF_TEMP} ${GETARCH_CONF_OUT}) + file(APPEND "${TARGET_CONF_TEMP}" ${GETARCH_CONF_OUT}) ParseGetArchVars(${GETARCH_MAKE_OUT}) set(GETARCH2_DIR "${PROJECT_BINARY_DIR}/getarch2_build") set(GETARCH2_BIN "getarch_2nd${CMAKE_EXECUTABLE_SUFFIX}") - file(MAKE_DIRECTORY ${GETARCH2_DIR}) - configure_file(${TARGET_CONF_TEMP} ${GETARCH2_DIR}/${TARGET_CONF} COPYONLY) + file(MAKE_DIRECTORY "${GETARCH2_DIR}") + configure_file("${TARGET_CONF_TEMP}" "${GETARCH2_DIR}/${TARGET_CONF}" COPYONLY) if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") - try_compile(GETARCH2_RESULT ${GETARCH2_DIR} - SOURCES ${PROJECT_SOURCE_DIR}/getarch_2nd.c + try_compile(GETARCH2_RESULT "${GETARCH2_DIR}" + SOURCES "${PROJECT_SOURCE_DIR}/getarch_2nd.c" COMPILE_DEFINITIONS ${EXFLAGS} ${GETARCH_FLAGS} ${GETARCH2_FLAGS} -I"${GETARCH2_DIR}" -I"${PROJECT_SOURCE_DIR}" -I"${PROJECT_BINARY_DIR}" OUTPUT_VARIABLE GETARCH2_LOG - COPY_FILE ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} + COPY_FILE "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" ) if (NOT ${GETARCH2_RESULT}) @@ -1395,9 +1395,9 @@ execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABL execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT) # append config data from getarch_2nd to the TARGET file and read in CMake vars - file(APPEND ${TARGET_CONF_TEMP} ${GETARCH2_CONF_OUT}) + file(APPEND "${TARGET_CONF_TEMP}" ${GETARCH2_CONF_OUT}) - configure_file(${TARGET_CONF_TEMP} ${TARGET_CONF_DIR}/${TARGET_CONF} COPYONLY) + configure_file("${TARGET_CONF_TEMP}" "${TARGET_CONF_DIR}/${TARGET_CONF}" COPYONLY) ParseGetArchVars(${GETARCH2_MAKE_OUT})