mirror of
https://github.com/hyperion-project/hyperion.ng.git
synced 2025-03-01 10:33:28 +00:00
* Fix macOS build * Update minimum cmake version * Correct compile errorswith Qt6.7 * Update minimum cmake version (2) * Use C++17 * Correct compile errors with Qt6.7 * Replace unsupported Lambda UniqueConnection * Support UTF-8 Output on console * Fix #1630
This commit is contained in:
8
dependencies/CMakeLists.txt
vendored
8
dependencies/CMakeLists.txt
vendored
@@ -133,6 +133,9 @@ endif()
|
||||
|
||||
if(ENABLE_PROTOBUF_SERVER)
|
||||
set(USE_SYSTEM_PROTO_LIBS ${DEFAULT_USE_SYSTEM_PROTO_LIBS} CACHE BOOL "use protobuf library from system")
|
||||
|
||||
# defines for 3rd party sub-modules
|
||||
set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Build abseil-cpp with C++ version requirements propagated")
|
||||
|
||||
if (USE_SYSTEM_PROTO_LIBS)
|
||||
find_package(Protobuf REQUIRED)
|
||||
@@ -161,9 +164,6 @@ if(ENABLE_PROTOBUF_SERVER)
|
||||
# define the protobuf library
|
||||
set(PROTOBUF_LIBRARIES protobuf::libprotobuf)
|
||||
|
||||
# defines for 3rd party sub-modules
|
||||
set(ABSL_PROPAGATE_CXX_STD ON CACHE BOOL "Build abseil-cpp with C++ version requirements propagated")
|
||||
|
||||
endif()
|
||||
|
||||
# redefine at parent scope
|
||||
@@ -270,7 +270,7 @@ if(ENABLE_DEV_NETWORK)
|
||||
set(USE_SYSTEM_MBEDTLS_LIBS OFF)
|
||||
endif (NOT MBEDTLS_FOUND)
|
||||
else()
|
||||
cmake_minimum_required(VERSION 3.2)
|
||||
cmake_minimum_required(VERSION 3.5.1)
|
||||
|
||||
set(CMAKE_POLICY_DEFAULT_CMP0071 NEW)
|
||||
|
||||
|
Reference in New Issue
Block a user