You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
1.0 KiB
29 lines
1.0 KiB
This file is part of MXE. See LICENSE.md for licensing information.
|
|
|
|
Contains ad hoc patches for cross building.
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Tony Theodore <tonyt@logyst.com>
|
|
Date: Sat, 2 Mar 2019 02:57:50 +1100
|
|
Subject: [PATCH 1/1] add option to disable protobuf
|
|
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index 1111111..2222222 100755
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -162,8 +162,11 @@ ENDIF(MINGW)
|
|
FIND_PACKAGE(SilverLining QUIET)
|
|
FIND_PACKAGE(Triton QUIET)
|
|
|
|
-FIND_PACKAGE(Protobuf QUIET)
|
|
-SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compiled as dll")
|
|
+OPTION(OSGEARTH_USE_PROTOBUF "Set to OFF to disable Protobuf" ON)
|
|
+IF (OSGEARTH_USE_PROTOBUF)
|
|
+ FIND_PACKAGE(Protobuf QUIET)
|
|
+ SET (PROTOBUF_USE_DLLS FALSE CACHE BOOL "Set this to true if Protobuf is compiled as dll")
|
|
+ENDIF (OSGEARTH_USE_PROTOBUF)
|
|
|
|
SET (WITH_EXTERNAL_DUKTAPE FALSE CACHE BOOL "Use bundled or system wide version of Duktape")
|
|
IF (WITH_EXTERNAL_DUKTAPE)
|