forked from hexdump0815/surge-arm-build
-
Notifications
You must be signed in to change notification settings - Fork 0
/
adjust-cmake.patch
27 lines (24 loc) · 1.02 KB
/
adjust-cmake.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
adjust cmake settings to be happy with the cmake 3.10 of ubuntu 18.04 - seems to work
and disable -Werror as it gives problems on armv7l - at least on ubuntu 18.04 with its gcc 7.5
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4ad951dd..110be29b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,8 +5,8 @@
# See issue 1206 for our working list to get this finished
#
-cmake_minimum_required(VERSION 3.15)
-cmake_policy(SET CMP0091 NEW)
+cmake_minimum_required(VERSION 3.10)
+#cmake_policy(SET CMP0091 NEW)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded$<$<CONFIG:Debug>:Debug>")
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.9 CACHE STRING "Build for 10.9")
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
@@ -34,7 +34,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang|GNU")
add_compile_options(
-Wno-multichar
# Targetting Windows with GCC/Clang is experimental
- $<$<NOT:$<BOOL:${WIN32}>>:-Werror>
+# $<$<NOT:$<BOOL:${WIN32}>>:-Werror>
# PE/COFF doesn't support visibility
$<$<NOT:$<BOOL:${WIN32}>>:-fvisibility=hidden>