|
|
|
@@ -192,7 +192,7 @@ else(NOT CMAKE_CROSSCOMPILING) |
|
|
|
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") |
|
|
|
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} |
|
|
|
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} |
|
|
|
) |
|
|
|
@@ -204,8 +204,8 @@ else(NOT CMAKE_CROSSCOMPILING) |
|
|
|
message(STATUS "Running getarch") |
|
|
|
|
|
|
|
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way |
|
|
|
execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT) |
|
|
|
execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE GETARCH_CONF_OUT) |
|
|
|
execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 0 OUTPUT_VARIABLE GETARCH_MAKE_OUT) |
|
|
|
execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH_BIN}" 1 OUTPUT_VARIABLE GETARCH_CONF_OUT) |
|
|
|
|
|
|
|
message(STATUS "GETARCH results:\n${GETARCH_MAKE_OUT}") |
|
|
|
|
|
|
|
@@ -220,7 +220,7 @@ execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE G |
|
|
|
if (NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "WindowsStore") |
|
|
|
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} |
|
|
|
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} |
|
|
|
) |
|
|
|
@@ -231,8 +231,8 @@ execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH_BIN} 1 OUTPUT_VARIABLE G |
|
|
|
endif () |
|
|
|
|
|
|
|
# use the cmake binary w/ the -E param to run a shell command in a cross-platform way |
|
|
|
execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT) |
|
|
|
execute_process(COMMAND ${PROJECT_BINARY_DIR}/${GETARCH2_BIN} 1 OUTPUT_VARIABLE GETARCH2_CONF_OUT) |
|
|
|
execute_process(COMMAND "${PROJECT_BINARY_DIR}/${GETARCH2_BIN}" 0 OUTPUT_VARIABLE GETARCH2_MAKE_OUT) |
|
|
|
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}) |
|
|
|
|