From f56597ac36fde170b0f48182bb5adb0ce642bba0 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Mon, 31 Jul 2023 11:05:31 +0100 Subject: [PATCH] Ninja needs BUILD_BYPRODUCTS set, make doesn't --- external/CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 78203d163..556676a00 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -752,11 +752,13 @@ if ((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)) + set(LIBSIGMF_LIBRARIES "${EXTERNAL_BUILD_LIBRARIES}/lib${LIB_SUFFIX}/liblibsigmf${CMAKE_SHARED_LIBRARY_SUFFIX}" CACHE INTERNAL "") ExternalProject_Add(libsigmf GIT_REPOSITORY https://github.com/f4exb/libsigmf.git GIT_TAG ${LIBSIGMF_TAG} PREFIX "${EXTERNAL_BUILD_LIBRARIES}/libsigmf" CMAKE_ARGS ${COMMON_CMAKE_ARGS} -DCMAKE_INSTALL_PREFIX= + BUILD_BYPRODUCTS "${LIBSIGMF_LIBRARIES}" TEST_COMMAND "" ) 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(LIBSIGMF_EXTERNAL ON 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)) # For APT demodulator