diff --git a/cmake/modules/NativeExecutable.cmake b/cmake/modules/NativeExecutable.cmake --- a/cmake/modules/NativeExecutable.cmake +++ b/cmake/modules/NativeExecutable.cmake @@ -7,15 +7,14 @@ set(NATIVE_BUILD_TARGET "${NATIVE_BUILD_DIR}/CMakeCache.txt") if(CMAKE_CROSSCOMPILING AND NOT TARGET native-cmake-build) - find_program(NINJA "ninja") - file(MAKE_DIRECTORY ${NATIVE_BUILD_DIR}) add_custom_command( OUTPUT ${NATIVE_BUILD_TARGET} COMMAND ${CMAKE_COMMAND} - -GNinja + -G "${CMAKE_GENERATOR}" "${CMAKE_SOURCE_DIR}" - -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${NATIVE_BINARY_DIR} + "-DCMAKE_MAKE_PROGRAM=${CMAKE_MAKE_PROGRAM}" + "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY:PATH=${NATIVE_BINARY_DIR}" WORKING_DIRECTORY ${NATIVE_BUILD_DIR} VERBATIM USES_TERMINAL ) @@ -27,7 +26,9 @@ if(CMAKE_CROSSCOMPILING) set(NATIVE_BINARY "${NATIVE_BINARY_DIR}/${NAME}") add_custom_target("build-native-${NAME}" - COMMAND ${NINJA} ${NAME} + COMMAND ${CMAKE_COMMAND} + --build "${NATIVE_BUILD_DIR}" + --target "${NAME}" DEPENDS ${NATIVE_BUILD_TARGET} BYPRODUCTS ${NATIVE_BINARY} WORKING_DIRECTORY ${NATIVE_BUILD_DIR}