1
0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 08:04:49 -05:00

Ninja needs BUILD_BYPRODUCTS set, make doesn't

This commit is contained in:
Jon Beniston 2023-07-31 11:05:31 +01:00
parent e16ff521d6
commit f56597ac36

View File

@ -752,11 +752,13 @@ if ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND)
endif ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND) endif ((NOT LIBDSDCC_FOUND OR LIBDSDCC_EXTERNAL) AND LIBMBE_FOUND)
if (LINUX AND (NOT LIBSIGMF_FOUND OR LIBSIGMF_EXTERNAL)) if (LINUX AND (NOT LIBSIGMF_FOUND OR LIBSIGMF_EXTERNAL))
set(LIBSIGMF_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/liblibsigmf${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
ExternalProject_Add(libsigmf ExternalProject_Add(libsigmf
GIT_REPOSITORY https://github.com/f4exb/libsigmf.git GIT_REPOSITORY https://github.com/f4exb/libsigmf.git
GIT_TAG ${LIBSIGMF_TAG} GIT_TAG ${LIBSIGMF_TAG}
PREFIX "${EXTERNAL_BUILD_LIBRARIES}/libsigmf" PREFIX "${EXTERNAL_BUILD_LIBRARIES}/libsigmf"
CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR> CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
BUILD_BYPRODUCTS "${LIBSIGMF_LIBRARIES}"
TEST_COMMAND "" TEST_COMMAND ""
) )
ExternalProject_Get_Property(libsigmf install_dir) ExternalProject_Get_Property(libsigmf install_dir)
@ -764,7 +766,6 @@ if (LINUX AND (NOT LIBSIGMF_FOUND OR LIBSIGMF_EXTERNAL))
set_global_cache(LIBSIGMF_FOUND ON) set_global_cache(LIBSIGMF_FOUND ON)
set(LIBSIGMF_EXTERNAL ON CACHE INTERNAL "") set(LIBSIGMF_EXTERNAL ON CACHE INTERNAL "")
set(LIBSIGMF_INCLUDE_DIR "${install_dir}/include" CACHE INTERNAL "") set(LIBSIGMF_INCLUDE_DIR "${install_dir}/include" CACHE INTERNAL "")
set(LIBSIGMF_LIBRARIES "${install_dir}/lib${LIB_SUFFIX}/liblibsigmf${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "")
endif (LINUX AND (NOT LIBSIGMF_FOUND OR LIBSIGMF_EXTERNAL)) endif (LINUX AND (NOT LIBSIGMF_FOUND OR LIBSIGMF_EXTERNAL))
# For APT demodulator # For APT demodulator