blob: f0f2a9ddd173c1285c1c7fe6b9e72b165795703f (
plain) (
blame)
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
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
--- CMakeLists.txt.orig 2021-08-21 20:57:34 UTC
+++ CMakeLists.txt
@@ -115,8 +115,8 @@ elseif("${CMAKE_SYSTEM_NAME}" MATCHES "FreeBSD")
# Platform-dependent implementation of system.h
# On FreeBSD we can use *_other
- set(SYSTEM_CPP_MODULE "system_other.cpp")
- set(SYSTEM_H_MODULE "system_other.h")
+ set(SYSTEM_CPP_MODULE "system_linux.cpp")
+ set(SYSTEM_H_MODULE "system_linux.h")
# To avoid CMake warning
set(CMAKE_MACOSX_RPATH 1)
else()
@@ -155,15 +155,8 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
message(STATUS "Detected GCC version 4.7+")
- set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-declarations")
- set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
+ set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
- if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
- set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wsuggest-override")
- endif()
-
- set(RELEASE_CXX_FLAGS "-O2")
- set(DEBUG_CXX_FLAGS "-g -O0")
set(TEST_CXX_FLAGS "-pthread")
add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -173,14 +166,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
message(STATUS "Detected Clang version 3.1+")
- if (${PLATFORM_FREEBSD})
- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
- endif()
-
- set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
- set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
- set(RELEASE_CXX_FLAGS "-O2")
- set(DEBUG_CXX_FLAGS "-g -O0")
+ set(NORMAL_CXX_FLAGS "-std=c++11 -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
set(TEST_CXX_FLAGS "-pthread")
add_definitions(-DNOEXCEPT=noexcept -DHAVE_DEMANGLE)
elseif(CMAKE_CXX_COMPILER_ID MATCHES "MSVC")
|
