Skip to content

Commit

Permalink
Add RelWithDebInfo build config for linux
Browse files Browse the repository at this point in the history
  • Loading branch information
RyeMutt authored and AiraYumi committed Jan 11, 2025
1 parent 0417596 commit f5451c1
Show file tree
Hide file tree
Showing 2 changed files with 58 additions and 10 deletions.
62 changes: 56 additions & 6 deletions autobuild.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3258,7 +3258,7 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<map>
<key>configurations</key>
<map>
<key>Release</key>
<key>RelWithDebInfo</key>
<map>
<key>configure</key>
<map>
Expand Down Expand Up @@ -3289,9 +3289,9 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
<key>default</key>
<string>True</string>
<key>name</key>
<string>Release</string>
<string>RelWithDebInfo</string>
</map>
<key>ReleaseOS</key>
<key>RelWithDebInfoOS</key>
<map>
<key>configure</key>
<map>
Expand All @@ -3316,15 +3316,65 @@ Copyright (c) 2012, 2014, 2015, 2016 nghttp2 contributors</string>
</array>
</map>
<key>name</key>
<string>ReleaseOS</string>
<string>RelWithDebInfoOS</string>
</map>
<key>Release</key>
<map>
<key>configure</key>
<map>
<key>options</key>
<array>
<string>-G</string>
<string>Unix Makefiles</string>
</array>
<key>arguments</key>
<array>
<string>../indra</string>
</array>
</map>
<key>build</key>
<map>
<key>command</key>
<string>cmake</string>
<key>options</key>
<array>
<string>--build</string>
<string>.</string>
<string>--config</string>
<string>Release</string>
<string>--parallel</string>
<string>$AUTOBUILD_CPU_COUNT</string>
</array>
</map>
<key>name</key>
<string>Release</string>
</map>
<key>default</key>
<key>ReleaseOS</key>
<map>
<key>configure</key>
<map>
<key>options</key>
<array>
<string>-G</string>
<string>Unix Makefiles</string>
</array>
</map>
<key>build</key>
<map>
<key>command</key>
<string>cmake</string>
<key>options</key>
<array>
<string>--build</string>
<string>.</string>
<string>--config</string>
<string>Release</string>
<string>--parallel</string>
<string>$AUTOBUILD_CPU_COUNT</string>
</array>
</map>
<key>name</key>
<string>default</string>
<string>ReleaseOS</string>
</map>
</map>
<key>build_directory</key>
Expand Down
6 changes: 2 additions & 4 deletions indra/cmake/00-Common.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -187,8 +187,6 @@ if (LINUX)
endif (LINUX)

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

if (NOT GCC_DISABLE_FATAL_WARNINGS)
if (NOT GCC_DISABLE_FATAL_WARNINGS AND NOT CLANG_DISABLE_FATAL_WARNINGS)
add_compile_options(-Werror)
endif ()
endif (NOT GCC_DISABLE_FATAL_WARNINGS AND NOT CLANG_DISABLE_FATAL_WARNINGS)

add_compile_options(${GCC_WARNINGS})
add_compile_options(-m${ADDRESS_SIZE})
Expand Down

0 comments on commit f5451c1

Please sign in to comment.