mirror of
https://github.com/RPCSX/rpcsx.git
synced 2025-12-06 07:12:14 +01:00
cmake: fix build with ninja
This commit is contained in:
parent
add1de6cdb
commit
fe5618063d
10
3rdparty/CMakeLists.txt
vendored
10
3rdparty/CMakeLists.txt
vendored
|
|
@ -43,9 +43,17 @@ add_custom_command(
|
||||||
add_custom_target(ffmpeg-configure DEPENDS ${FFMPEG_PATH}/config.h)
|
add_custom_target(ffmpeg-configure DEPENDS ${FFMPEG_PATH}/config.h)
|
||||||
|
|
||||||
function(import_ffmpeg_library name)
|
function(import_ffmpeg_library name)
|
||||||
|
if (${CMAKE_GENERATOR} STREQUAL "Unix Makefiles")
|
||||||
|
set(MAKE_COMMAND $(MAKE) -j$(nproc))
|
||||||
|
elseif (${CMAKE_GENERATOR} STREQUAL "Ninja")
|
||||||
|
set(MAKE_COMMAND make -j$$(nproc))
|
||||||
|
else()
|
||||||
|
set(MAKE_COMMAND make)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${FFMPEG_PATH}/lib${name}/lib${name}.a"
|
OUTPUT "${FFMPEG_PATH}/lib${name}/lib${name}.a"
|
||||||
COMMAND $(MAKE) -C ${FFMPEG_PATH} "lib${name}/lib${name}.a"
|
COMMAND ${MAKE_COMMAND} -C ${FFMPEG_PATH} "lib${name}/lib${name}.a"
|
||||||
COMMENT "Building lib${name}/lib${name}.a"
|
COMMENT "Building lib${name}/lib${name}.a"
|
||||||
DEPENDS ffmpeg-configure
|
DEPENDS ffmpeg-configure
|
||||||
WORKING_DIRECTORY ${FFMPEG_PATH}
|
WORKING_DIRECTORY ${FFMPEG_PATH}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue