Skip to content

Commit 01ea63b

Browse files
author
Tor Didriksen
committed
Bug#18374703 COMPILATION ERROR WITH -DENABLE_DEBUG_SYNC=0 AND -DWITH_DEBUG=ON
Post-push fix. Problem cmake without explicit build type was broken on windows. Fix: do not test for build type, always extend CMAKE_C[XX]_FLAGS_DEBUG
1 parent 883211c commit 01ea63b

File tree

1 file changed

+3
-5
lines changed

1 file changed

+3
-5
lines changed

CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -252,11 +252,9 @@ IF (WITH_ASAN)
252252
ENDIF()
253253
ENDIF()
254254

255-
256-
IF(CMAKE_BUILD_TYPE MATCHES "Debug" OR WITH_DEBUG)
257-
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
258-
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
259-
ENDIF()
255+
# Always enable debug sync for debug builds.
256+
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
257+
SET(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -DENABLED_DEBUG_SYNC")
260258

261259
OPTION(ENABLE_GCOV "Enable gcov (debug, Linux builds only)" OFF)
262260
IF (ENABLE_GCOV AND NOT WIN32 AND NOT APPLE)

0 commit comments

Comments
 (0)