Skip to content

Commit 06227bb

Browse files
authored
fix cmake for debugging (#6795)
1 parent a918ef0 commit 06227bb

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/finder")
5757
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/rpavlik-cmake-modules")
5858
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/external/cotire")
5959

60+
INCLUDE(globals)
6061
INCLUDE(toolchain)
6162
include(embed_file)
6263

@@ -159,7 +160,6 @@ mark_as_advanced(FORCE FSO_BUILD_WITH_VULKAN)
159160
mark_as_advanced(FORCE FSO_BUILD_WITH_OPENXR)
160161
mark_as_advanced(FORCE FSO_BUILD_WITH_OPENXR_DEBUG)
161162

162-
INCLUDE(globals)
163163
INCLUDE(platforms)
164164
include(version)
165165

cmake/toolchain-clang.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,14 +119,14 @@ string(REGEX MATCH "-O[a-zA-Z|0-9]+" C_OPT_FLAG ${C_BASE_FLAGS})
119119
# If no user-set opt flag, set -O3 and -Og
120120
if ("${CXX_OPT_FLAG}" STREQUAL "")
121121
set(CXX_OPT_FLAG_RELEASE "-O3")
122-
set(CXX_OPT_FLAG_DEBUG "-Og")
122+
set(CXX_OPT_FLAG_DEBUG "-O0")
123123
else()
124124
set(CXX_OPT_FLAG_RELEASE "${CXX_OPT_FLAG}")
125125
set(CXX_OPT_FLAG_DEBUG "${CXX_OPT_FLAG}")
126126
endif()
127127
if ("${C_OPT_FLAG}" STREQUAL "")
128128
set(C_OPT_FLAG_RELEASE "-O3")
129-
set(C_OPT_FLAG_DEBUG "-Og")
129+
set(C_OPT_FLAG_DEBUG "-O0")
130130
else()
131131
set(C_OPT_FLAG_RELEASE "${C_OPT_FLAG}")
132132
set(C_OPT_FLAG_DEBUG "${C_OPT_FLAG}")

cmake/toolchain-gcc.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,14 +161,14 @@ string(REGEX MATCH "-O[a-zA-Z|0-9]+" C_OPT_FLAG ${C_BASE_FLAGS})
161161
# If no user-set opt flag, set -O3 and -Og
162162
if ("${CXX_OPT_FLAG}" STREQUAL "")
163163
set(CXX_OPT_FLAG_RELEASE "-O3")
164-
set(CXX_OPT_FLAG_DEBUG "-Og")
164+
set(CXX_OPT_FLAG_DEBUG "-O0")
165165
else()
166166
set(CXX_OPT_FLAG_RELEASE "${CXX_OPT_FLAG}")
167167
set(CXX_OPT_FLAG_DEBUG "${CXX_OPT_FLAG}")
168168
endif()
169169
if ("${C_OPT_FLAG}" STREQUAL "")
170170
set(C_OPT_FLAG_RELEASE "-O3")
171-
set(C_OPT_FLAG_DEBUG "-Og")
171+
set(C_OPT_FLAG_DEBUG "-O0")
172172
else()
173173
set(C_OPT_FLAG_RELEASE "${C_OPT_FLAG}")
174174
set(C_OPT_FLAG_DEBUG "${C_OPT_FLAG}")

0 commit comments

Comments
 (0)