Browse Source

Use same warnings as with makefile

Thomas Buck 10 years ago
parent
commit
70d3f0eca7
1 changed files with 25 additions and 7 deletions
  1. 25
    7
      CMakeLists.txt

+ 25
- 7
CMakeLists.txt View File

@@ -65,16 +65,27 @@ add_executable (OpenRaider MACOSX_BUNDLE
65 65
 # Default to Debug build
66 66
 set (CMAKE_BUILD_TYPE "Debug")
67 67
 
68
+# Debug build warnings
69
+set (WARNINGS "${WARNINGS} -Weverything -Wno-padded -Wno-packed")
70
+set (WARNINGS "${WARNINGS} -Wno-global-constructors -Wno-exit-time-destructors")
71
+set (WARNINGS "${WARNINGS} -Wno-documentation-unknown-command -Wno-c++98-compat-pedantic")
72
+set (WARNINGS "${WARNINGS} -Wno-missing-prototypes -Wno-missing-variable-declarations")
73
+set (WARNINGS "${WARNINGS} -Wno-disabled-macro-expansion")
74
+
75
+set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
76
+
68 77
 # Flags for all builds
69 78
 set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11")
70 79
 set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_EMITTER")
71 80
 
72 81
 # Flags for Debug build
82
+set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0 ${WARNINGS}")
73 83
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DDEBUG")
74 84
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -DEXPERIMENTAL")
75 85
 
76 86
 # Flags for Releasae builds
77
-set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE}")
87
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -ffast-math -funroll-loops")
88
+set (OpenRaider_CXX_FLAGS_RELEASE "${OpenRaider_CXX_FLAGS_RELEASE} -fomit-frame-pointer -O2")
78 89
 
79 90
 # Apply Flags
80 91
 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${OpenRaider_CXX_FLAGS}")
@@ -87,36 +98,43 @@ include_directories ("${PROJECT_SOURCE_DIR}/include")
87 98
 # Include External Modules
88 99
 set (CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
89 100
 
101
+# Add Math Library
102
+set (LIBS ${LIBS} m)
103
+
90 104
 # Add SDL2 Library
91 105
 find_package (SDL2 REQUIRED)
92
-include_directories (${SDL2_INCLUDE_DIR})
106
+include_directories (SYSTEM ${SDL2_INCLUDE_DIR})
93 107
 set (LIBS ${LIBS} ${SDL2_LIBRARY})
94 108
 
95 109
 # Add SDL2_ttf Library
96 110
 find_package (SDL2TTF REQUIRED)
97
-include_directories (${SDL2TTF_INCLUDE_DIR})
111
+include_directories (SYSTEM ${SDL2TTF_INCLUDE_DIR})
98 112
 set (LIBS ${LIBS} ${SDL2TTF_LIBRARY})
99 113
 
100 114
 # Add OpenGL Library
101 115
 find_package (OpenGL REQUIRED)
102
-include_directories (${OPENGL_INCLUDE_DIRS})
116
+include_directories (SYSTEM ${OPENGL_INCLUDE_DIRS})
103 117
 set (LIBS ${LIBS} ${OPENGL_LIBRARIES})
104 118
 
105 119
 # Add OpenAL Library
106 120
 find_package (OpenAL REQUIRED)
107
-include_directories (${OPENAL_INCLUDE_DIRS})
121
+include_directories (SYSTEM ${OPENAL_INCLUDE_DIRS})
108 122
 set (LIBS ${LIBS} ${OPENAL_LIBRARIES})
109 123
 
110 124
 # Add ALUT Library
111 125
 find_package (ALUT REQUIRED)
112
-include_directories (${ALUT_INCLUDE_DIRS})
126
+include_directories (SYSTEM ${ALUT_INCLUDE_DIRS})
113 127
 set (LIBS ${LIBS} ${ALUT_LIBRARIES})
114 128
 
115 129
 # Add Z Library
116 130
 find_package (ZLIB REQUIRED)
117
-include_directories (${ZLIB_INCLUDE_DIRS})
131
+include_directories (SYSTEM ${ZLIB_INCLUDE_DIRS})
118 132
 set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
119 133
 
134
+# Add Thread Library
135
+find_package (Threads REQUIRED)
136
+set (LIBS ${LIBS} ${CMAKE_THREAD_LIBS_INIT})
137
+
120 138
 # Link to all found libs
121 139
 target_link_libraries (OpenRaider ${LIBS})
122 140
 

Loading…
Cancel
Save