Disable Trezor compilation on protobuf discovery as per #83

uPlexa · May 4, 2021 · fb35763 · fb35763
1 parent a9fd253
commit fb35763
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/src/device_trezor/CMakeLists.txt b/src/device_trezor/CMakeLists.txt
@@ -66,8 +66,7 @@ set(trezor_private_headers)
 include(FindProtobuf)
 find_package(Protobuf)  # REQUIRED
 
-# Test for HAVE_PROTOBUF from the parent
-if(Protobuf_FOUND AND HAVE_PROTOBUF)
+if(Protobuf_FOUND AND HAVE_PROTOBUF AND WITH_TREZOR)
     if ("$ENV{PYTHON3}" STREQUAL "")
         set(PYTHON3 "python3")
     else()

diff --git a/src/device_trezor/trezor/trezor_defs.hpp b/src/device_trezor/trezor/trezor_defs.hpp
@@ -27,7 +27,7 @@
 // THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 
-#if defined(HAVE_PROTOBUF) && !defined(WITHOUT_TREZOR)
+#if defined(HAVE_PROTOBUF) && defined(WITH_TREZOR)
   #define WITH_DEVICE_TREZOR 1
 #else
   #define WITH_DEVICE_TREZOR 0

diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp
@@ -75,7 +75,7 @@ using namespace epee;
 #include "ringct/rctSigs.h"
 #include "ringdb.h"
 #include "device/device_cold.hpp"
-#include "device_trezor/device_trezor.hpp"
+//#include "device_trezor/device_trezor.hpp"
 
 #include "cryptonote_core/utility_node_rules.h"