Do not use native CMake config for Protobuf on Linux (#1529)
On Ubuntu 16.04, we have to install Protobuf 3. Unfortunately, `find_package()`ing Protobuf using native installed CMake `CONFIG` is problematic in case if there is a system Protobuf 2 installed, while the bundled CMake module works correctly and manages to avoid interference with system-installed Protobuf 2.master
parent
301a72fa42
commit
cbc0a2ac9a
|
@ -39,10 +39,11 @@ find_package(Boost REQUIRED COMPONENTS ${BOOST_COMPONENTS})
|
||||||
find_package(Ceres REQUIRED COMPONENTS SuiteSparse)
|
find_package(Ceres REQUIRED COMPONENTS SuiteSparse)
|
||||||
find_package(Eigen3 REQUIRED)
|
find_package(Eigen3 REQUIRED)
|
||||||
find_package(LuaGoogle REQUIRED)
|
find_package(LuaGoogle REQUIRED)
|
||||||
# On Windows, Protobuf is incorrectly found by the bundled CMake module. Prefer native CMake config, if possible.
|
if(WIN32)
|
||||||
|
# On Windows, Protobuf is incorrectly found by the bundled CMake module, so prefer native CMake config.
|
||||||
set(protobuf_MODULE_COMPATIBLE TRUE CACHE INTERNAL "")
|
set(protobuf_MODULE_COMPATIBLE TRUE CACHE INTERNAL "")
|
||||||
find_package(Protobuf 3.0.0 CONFIG QUIET)
|
find_package(Protobuf 3.0.0 CONFIG)
|
||||||
if (NOT PROTOBUF_FOUND)
|
else()
|
||||||
find_package(Protobuf 3.0.0 REQUIRED)
|
find_package(Protobuf 3.0.0 REQUIRED)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue