Skip to content

Commit f5451c1

Browse files
Rye CogtailAiraYumi
Rye Cogtail
authored andcommitted
Add RelWithDebInfo build config for linux
1 parent 0417596 commit f5451c1

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
@@ -3258,7 +3258,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
32583258
<map>
32593259
<key>configurations</key>
32603260
<map>
3261-
<key>Release</key>
3261+
<key>RelWithDebInfo</key>
32623262
<map>
32633263
<key>configure</key>
32643264
<map>
@@ -3289,9 +3289,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
32893289
<key>default</key>
32903290
<string>True</string>
32913291
<key>name</key>
3292-
<string>Release</string>
3292+
<string>RelWithDebInfo</string>
32933293
</map>
3294-
<key>ReleaseOS</key>
3294+
<key>RelWithDebInfoOS</key>
32953295
<map>
32963296
<key>configure</key>
32973297
<map>
@@ -3316,15 +3316,65 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
33163316
</array>
33173317
</map>
33183318
<key>name</key>
3319-
<string>ReleaseOS</string>
3319+
<string>RelWithDebInfoOS</string>
3320+
</map>
3321+
<key>Release</key>
3322+
<map>
3323+
<key>configure</key>
3324+
<map>
3325+
<key>options</key>
3326+
<array>
3327+
<string>-G</string>
3328+
<string>Unix Makefiles</string>
3329+
</array>
3330+
<key>arguments</key>
3331+
<array>
3332+
<string>../indra</string>
3333+
</array>
3334+
</map>
3335+
<key>build</key>
3336+
<map>
3337+
<key>command</key>
3338+
<string>cmake</string>
3339+
<key>options</key>
3340+
<array>
3341+
<string>--build</string>
3342+
<string>.</string>
3343+
<string>--config</string>
3344+
<string>Release</string>
3345+
<string>--parallel</string>
3346+
<string>$AUTOBUILD_CPU_COUNT</string>
3347+
</array>
3348+
</map>
3349+
<key>name</key>
3350+
<string>Release</string>
33203351
</map>
3321-
<key>default</key>
3352+
<key>ReleaseOS</key>
33223353
<map>
3354+
<key>configure</key>
3355+
<map>
3356+
<key>options</key>
3357+
<array>
3358+
<string>-G</string>
3359+
<string>Unix Makefiles</string>
3360+
</array>
3361+
</map>
33233362
<key>build</key>
33243363
<map>
3364+
<key>command</key>
3365+
<string>cmake</string>
3366+
<key>options</key>
3367+
<array>
3368+
<string>--build</string>
3369+
<string>.</string>
3370+
<string>--config</string>
3371+
<string>Release</string>
3372+
<string>--parallel</string>
3373+
<string>$AUTOBUILD_CPU_COUNT</string>
3374+
</array>
33253375
</map>
33263376
<key>name</key>
3327-
<string>default</string>
3377+
<string>ReleaseOS</string>
33283378
</map>
33293379
</map>
33303380
<key>build_directory</key>

indra/cmake/00-Common.cmake

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

189189
if (DARWIN)
190-
# Warnings should be fatal -- thanks, Nicky Perian, for spotting reversed default
191-
set(CLANG_DISABLE_FATAL_WARNINGS OFF)
192190
set(CMAKE_CXX_LINK_FLAGS "-Wl,-headerpad_max_install_names,-search_paths_first")
193191
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_CXX_LINK_FLAGS}")
194192
set(DARWIN_extra_cstar_flags "-Wno-deprecated-declarations")
@@ -220,9 +218,9 @@ if(LINUX OR DARWIN)
220218
add_compile_options(-Wno-stringop-truncation -Wno-parentheses -Wno-c++20-compat)
221219
endif()
222220

223-
if (NOT GCC_DISABLE_FATAL_WARNINGS)
221+
if (NOT GCC_DISABLE_FATAL_WARNINGS AND NOT CLANG_DISABLE_FATAL_WARNINGS)
224222
add_compile_options(-Werror)
225-
endif ()
223+
endif (NOT GCC_DISABLE_FATAL_WARNINGS AND NOT CLANG_DISABLE_FATAL_WARNINGS)
226224

227225
add_compile_options(${GCC_WARNINGS})
228226
add_compile_options(-m${ADDRESS_SIZE})

0 commit comments

Comments
 (0)