Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 22:51:20 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Review fixes

Browse source
This commit is contained in:
Dale Glass 2021-04-06 00:54:59 +02:00
parent 43f6fd82f4
commit e070a21bf4
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cmake/macros/MemoryDebugger.cmake
View file

@ -9,7 +9,7 @@
macro(SETUP_MEMORY_DEBUGGER) macro(SETUP_MEMORY_DEBUGGER)
if ("$ENV{VIRCADIA_MEMORY_DEBUGGING}") if ("$ENV{VIRCADIA_MEMORY_DEBUGGING}")
if (DEFINED VIRCADIA_THREAD_DEBUGGING ) if (VIRCADIA_THREAD_DEBUGGING)
message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." ) message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." )
endif() endif()

10
cmake/macros/ThreadDebugger.cmake
View file

@ -9,18 +9,18 @@
macro(SETUP_THREAD_DEBUGGER) macro(SETUP_THREAD_DEBUGGER)
if ("$ENV{VIRCADIA_THREAD_DEBUGGING}") if ("$ENV{VIRCADIA_THREAD_DEBUGGING}")
if (DEFINED VIRCADIA_MEMORY_DEBUGGING ) if (VIRCADIA_MEMORY_DEBUGGING )
message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." ) message(FATAL_ERROR "Thread debugging and memory debugging can't be enabled at the same time." )
endif () endif ()
SET( VIRCADIA_THREAD_DEBUGGING true ) SET(VIRCADIA_THREAD_DEBUGGING true)
endif () endif ()
if (VIRCADIA_THREAD_DEBUGGING) if (VIRCADIA_THREAD_DEBUGGING)
if (UNIX) if (UNIX)
if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
# for clang on Linux # for clang on Linux
SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fno-omit-frame-pointer" ) SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=thread -fno-omit-frame-pointer")
SET(CMAKE_EXE_LINKER_FLAGS "-fsanitize=thread ${CMAKE_EXE_LINKER_FLAGS}") SET(CMAKE_EXE_LINKER_FLAGS "-fsanitize=thread ${CMAKE_EXE_LINKER_FLAGS}")
SET(CMAKE_SHARED_LINKER_FLAGS "-fsanitize=thread ${CMAKE_EXE_LINKER_FLAGS}") SET(CMAKE_SHARED_LINKER_FLAGS "-fsanitize=thread ${CMAKE_EXE_LINKER_FLAGS}")
else () else ()
@ -30,7 +30,7 @@ if (VIRCADIA_THREAD_DEBUGGING)
SET(CMAKE_SHARED_LINKER_FLAGS "-fsanitize=thread ${CMAKE_EXE_LINKER_FLAGS}") SET(CMAKE_SHARED_LINKER_FLAGS "-fsanitize=thread ${CMAKE_EXE_LINKER_FLAGS}")
endif() endif()
else() else()
message(FATAL_ERROR "Thread debugging is not supported on this platform." ) message(FATAL_ERROR "Thread debugging is not supported on this platform.")
endif (UNIX) endif()
endif () endif ()
endmacro(SETUP_THREAD_DEBUGGER) endmacro(SETUP_THREAD_DEBUGGER)