From cc150cc2c60117d3fe7e38ccaa75139b9f0d9198 Mon Sep 17 00:00:00 2001 From: Jan Beich Date: Wed, 25 May 2022 23:12:20 +0000 Subject: [PATCH] build/cmake: unbreak USE_SYSTEM_FLATBUFFERS after bec0b6e8c33d -- Checking for module 'flatbuffers>=2.0.0' -- Found flatbuffers, version 2.0.6 CMake Error at 3rdparty/CMakeLists.txt:24 (message): Flatbuffers flatc execute failed with: '' --- 3rdparty/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index d3928cb096..3d84d3f1f5 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -19,9 +19,9 @@ if (USE_SYSTEM_FLATBUFFERS) pkg_check_modules(FLATBUFFERS REQUIRED IMPORTED_TARGET flatbuffers>=2.0.0) target_link_libraries(3rdparty_flatbuffers INTERFACE PkgConfig::FLATBUFFERS) set(FBS_DIR "${CMAKE_CURRENT_SOURCE_DIR}/../rpcs3/Emu/NP/generated/") - execute_process(COMMAND "flatc --cpp -o ${FBS_DIR} ${FBS_DIR}/np2_structs.fbs" RESULT_VARIABLE FBS_CMD_ERROR) + execute_process(COMMAND flatc --cpp -o "${FBS_DIR}" "${FBS_DIR}/np2_structs.fbs" RESULT_VARIABLE FBS_CMD_ERROR) if(FBS_CMD_ERROR AND NOT FBS_CMD_ERROR EQUAL 0) - message(FATAL_ERROR "Flatbuffers flatc execute failed with: '${STATUS}'") + message(FATAL_ERROR "flatc failed to regenerate flatbuffers headers.") endif() else() target_include_directories(3rdparty_flatbuffers INTERFACE flatbuffers/include)