--- Source/cmake/BubblewrapSandboxChecks.cmake.bwrap 2019-09-23 11:20:00.000000000 +0300 +++ Source/cmake/BubblewrapSandboxChecks.cmake 2019-09-23 16:35:56.444422872 +0300 @@ -1,8 +1,4 @@ if (ENABLE_BUBBLEWRAP_SANDBOX) - find_program(BWRAP_EXECUTABLE bwrap) - if (NOT BWRAP_EXECUTABLE) - message(FATAL_ERROR "bwrap executable is needed for ENABLE_BUBBLEWRAP_SANDBOX") - endif () find_package(Libseccomp) if (NOT LIBSECCOMP_FOUND) @@ -16,12 +12,12 @@ if (NOT CMAKE_CROSSCOMPILING) execute_process( - COMMAND "${BWRAP_EXECUTABLE}" --version + COMMAND "${BWRAP_BIN}" --version RESULT_VARIABLE BWRAP_RET OUTPUT_VARIABLE BWRAP_OUTPUT ) if (BWRAP_RET) - message(FATAL_ERROR "Failed to run ${BWRAP_EXECUTABLE}") + message(FATAL_ERROR "Failed to run ${BWRAP_BIN}") endif () string(REGEX MATCH "[0-9]+\\.[0-9]+\\.[0-9]+" BWRAP_VERSION "${BWRAP_OUTPUT}") if (NOT "${BWRAP_VERSION}" VERSION_GREATER_EQUAL "0.3.1") @@ -39,6 +35,6 @@ ) endif () - add_definitions(-DBWRAP_EXECUTABLE="${BWRAP_EXECUTABLE}") + add_definitions(-DBWRAP_EXECUTABLE="${BWRAP_BIN}") add_definitions(-DDBUS_PROXY_EXECUTABLE="${DBUS_PROXY_EXECUTABLE}") endif ()