Fix ogg dependency

This commit is contained in:
KatieFrogs 2021-10-22 10:29:06 +03:00
parent c6a7070428
commit 15713562a1

View File

@ -109,7 +109,7 @@ if(NOT WIN32 AND USE_CELT)
CFLAGS="${CELT_${ver}_CFLAGS}"
)
set(CELT_${ver}_CONFIGURE_DEPENDS
${CELT_${ver}_PATH}/configure
)
if(OGG_PATH)
foreach(ogg_include ${OGG_INCLUDE_DIR})
@ -119,9 +119,6 @@ if(NOT WIN32 AND USE_CELT)
LDFLAGS="-L${OGG_BIN}"
CPPFLAGS="${OGG_INCLUDES}"
)
list(APPEND CELT_${ver}_CONFIGURE_DEPENDS
${OGG_BIN}/libogg.a
)
endif()
if(NOT EXISTS ${CELT_${ver}_PATH}/configure)
@ -135,10 +132,13 @@ if(NOT WIN32 AND USE_CELT)
file(MAKE_DIRECTORY ${CELT_${ver}_BIN})
add_custom_target(CELT_${ver}_CONFIGURE
COMMAND "${CELT_${ver}_PATH}/configure" ${CELT_${ver}_CONF}
DEPENDS ${CELT_${ver}_CONFIGURE_DEPENDS}
DEPENDS ${CELT_${ver}_PATH}/configure
BYPRODUCTS ${CELT_${ver}_BIN}/Makefile
WORKING_DIRECTORY ${CELT_${ver}_BIN}
)
if(OGG_PATH)
add_dependencies(CELT_${ver}_CONFIGURE ogg)
endif()
add_custom_target(CELT_${ver}_MAKE
COMMAND make
DEPENDS ${CELT_${ver}_BIN}/Makefile