mirror of
https://git.eden-emu.dev/eden-emu/eden.git
synced 2026-09-03 03:09:13 +00:00
ok no broken make
This commit is contained in:
Vendored
+4
-9
@@ -327,21 +327,16 @@ else()
|
|||||||
|
|
||||||
set(FFmpeg_BUILD_LIBRARIES ${FFmpeg_LIBRARIES})
|
set(FFmpeg_BUILD_LIBRARIES ${FFmpeg_LIBRARIES})
|
||||||
|
|
||||||
find_program(MAKE_PROGRAM NAMES gmake gnumake GNUmake)
|
find_program(MAKE NAMES gmake make REQUIRED)
|
||||||
if (MAKE_PROGRAM_FOUND AND SYSTEM_THREADS GREATER 1)
|
if (SYSTEM_THREADS GREATER 1)
|
||||||
# This version of make (GNU's make) supports subprocess threading jobs
|
set(FFmpeg_MAKE_ARGS -j ${SYSTEM_THREADS})
|
||||||
set(FFmpeg_MAKE_ARGS -j${SYSTEM_THREADS})
|
|
||||||
else()
|
|
||||||
# No GNU make implies that this system may be highly non-GNU
|
|
||||||
find_program(MAKE make required)
|
|
||||||
set(FFmpeg_MAKE_ARGS "")
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT
|
OUTPUT
|
||||||
${FFmpeg_BUILD_LIBRARIES}
|
${FFmpeg_BUILD_LIBRARIES}
|
||||||
COMMAND
|
COMMAND
|
||||||
${MAKE_PROGRAM} ${FFmpeg_MAKE_ARGS}
|
${MAKE} ${FFmpeg_MAKE_ARGS}
|
||||||
WORKING_DIRECTORY
|
WORKING_DIRECTORY
|
||||||
${FFmpeg_BUILD_DIR}
|
${FFmpeg_BUILD_DIR}
|
||||||
)
|
)
|
||||||
|
|||||||
Reference in New Issue
Block a user