3party/easy_profiler
0
0
Fork 0
mirror of https://github.com/yse/easy_profiler.git synced 2024-12-26 08:01:51 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #127 from mchiasson/patch-2

Browse Source 
avoid leaking -std=gnu++11 flag to user's targets
This commit is contained in:
Sergey Yagovtsev 2018-10-02 01:12:01 +03:00 committed by GitHub
commit 1eb2fa4fa2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -3,6 +3,15 @@ project(easy_profiler CXX)
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
if (CMAKE_VERSION VERSION_LESS "3.1")
if (CMAKE_CXX_COMPILER_ID STREQUAL "GNU" OR CMAKE_CXX_COMPILER_ID STREQUAL "Clang" OR CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang")
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=gnu++11")
endif ()
else ()
set(CMAKE_CXX_STANDARD 11)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
endif ()
option(EASY_PROFILER_NO_GUI "Build easy_profiler without the GUI application (required Qt)" OFF)
set(EASY_PROGRAM_VERSION_MAJOR 2)

18
easy_profiler_core/CMakeLists.txt
View File

@ -20,9 +20,9 @@ if (NOT WIN32)
set(NO_CXX11_THREAD_LOCAL_SUPPORT TRUE)
endif ()
endif ()
# TODO: Check thread_local keyword support for other compilers for Unix
if (NO_CXX11_THREAD_LOCAL_SUPPORT)
message(WARNING " Your compiler does not support C++11 thread_local feature.")
message(WARNING " Without C++11 thread_local feature you may face to possible memory leak or application crash if using implicit thread registration and using EASY_THREAD instead of EASY_THREAD_SCOPE.")
@ -233,20 +233,6 @@ if (MSVC)
target_compile_options(easy_profiler PRIVATE /WX)
endif ()
if (APPLE)
target_compile_options(easy_profiler PUBLIC -std=gnu++11)
else ()
if (CMAKE_VERSION VERSION_LESS "3.1")
if (NOT MSVC)
target_compile_options(easy_profiler PUBLIC $<$<COMPILE_LANGUAGE:CXX>:-std=gnu++11>)
endif ()
else ()
if (NOT MSVC)
target_compile_options(easy_profiler PUBLIC -std=gnu++11)
endif ()
set_target_properties(easy_profiler PROPERTIES CXX_STANDARD 11 CXX_STANDARD_REQUIRED ON)
endif ()
endif ()
# End adding platform specific compile options.
###############################################################################