Skip to content

Commit e84a180

Browse files
Rye Cogtailrohvani
authored andcommitted
Add RelWithDebInfo build config for linux
1 parent cedcb91 commit e84a180

File tree

2 files changed

+58
-10
lines changed

2 files changed

+58
-10
lines changed

autobuild.xml

Lines changed: 56 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3202,7 +3202,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
32023202
<map>
32033203
<key>configurations</key>
32043204
<map>
3205-
<key>Release</key>
3205+
<key>RelWithDebInfo</key>
32063206
<map>
32073207
<key>configure</key>
32083208
<map>
@@ -3233,9 +3233,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
32333233
<key>default</key>
32343234
<string>True</string>
32353235
<key>name</key>
3236-
<string>Release</string>
3236+
<string>RelWithDebInfo</string>
32373237
</map>
3238-
<key>ReleaseOS</key>
3238+
<key>RelWithDebInfoOS</key>
32393239
<map>
32403240
<key>configure</key>
32413241
<map>
@@ -3260,15 +3260,65 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
32603260
</array>
32613261
</map>
32623262
<key>name</key>
3263-
<string>ReleaseOS</string>
3263+
<string>RelWithDebInfoOS</string>
3264+
</map>
3265+
<key>Release</key>
3266+
<map>
3267+
<key>configure</key>
3268+
<map>
3269+
<key>options</key>
3270+
<array>
3271+
<string>-G</string>
3272+
<string>Unix Makefiles</string>
3273+
</array>
3274+
<key>arguments</key>
3275+
<array>
3276+
<string>../indra</string>
3277+
</array>
3278+
</map>
3279+
<key>build</key>
3280+
<map>
3281+
<key>command</key>
3282+
<string>cmake</string>
3283+
<key>options</key>
3284+
<array>
3285+
<string>--build</string>
3286+
<string>.</string>
3287+
<string>--config</string>
3288+
<string>Release</string>
3289+
<string>--parallel</string>
3290+
<string>$AUTOBUILD_CPU_COUNT</string>
3291+
</array>
3292+
</map>
3293+
<key>name</key>
3294+
<string>Release</string>
32643295
</map>
3265-
<key>default</key>
3296+
<key>ReleaseOS</key>
32663297
<map>
3298+
<key>configure</key>
3299+
<map>
3300+
<key>options</key>
3301+
<array>
3302+
<string>-G</string>
3303+
<string>Unix Makefiles</string>
3304+
</array>
3305+
</map>
32673306
<key>build</key>
32683307
<map>
3308+
<key>command</key>
3309+
<string>cmake</string>
3310+
<key>options</key>
3311+
<array>
3312+
<string>--build</string>
3313+
<string>.</string>
3314+
<string>--config</string>
3315+
<string>Release</string>
3316+
<string>--parallel</string>
3317+
<string>$AUTOBUILD_CPU_COUNT</string>
3318+
</array>
32693319
</map>
32703320
<key>name</key>
3271-
<string>default</string>
3321+
<string>ReleaseOS</string>
32723322
</map>
32733323
</map>
32743324
<key>build_directory</key>

indra/cmake/00-Common.cmake

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,8 +185,6 @@ if (LINUX)
185185
endif (LINUX)
186186

187187
if (DARWIN)
188-
# Warnings should be fatal -- thanks, Nicky Perian, for spotting reversed default
189-
set(CLANG_DISABLE_FATAL_WARNINGS OFF)
190188
set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
191189
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
192190
set(DARWIN_extra_cstar_flags "-Wno-deprecated-declarations")
@@ -214,9 +212,9 @@ if(LINUX OR DARWIN)
214212
add_compile_options(-Wno-stringop-truncation -Wno-parentheses -Wno-c++20-compat)
215213
endif()
216214

217-
if (NOT GCC_DISABLE_FATAL_WARNINGS)
215+
if (NOT GCC_DISABLE_FATAL_WARNINGS AND NOT CLANG_DISABLE_FATAL_WARNINGS)
218216
add_compile_options(-Werror)
219-
endif ()
217+
endif (NOT GCC_DISABLE_FATAL_WARNINGS AND NOT CLANG_DISABLE_FATAL_WARNINGS)
220218

221219
add_compile_options(${GCC_WARNINGS})
222220
add_compile_options(-m${ADDRESS_SIZE})

0 commit comments

Comments
 (0)