From c1fb4223657e5c2016f29068897d1cab74f6ed64 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Fri, 15 Dec 2017 21:45:12 -0800 Subject: Minor updates to CMake files --- CMakeLists.txt | 5 ++++- Graphics/GraphicsEngineOpenGL/CMakeLists.txt | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 64fa8b18..1378a9d1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -76,13 +76,16 @@ else() endif() if(PLATFORM_WIN32 OR PLATFORM_UNIVERSAL_WINDOWS) + # https://cmake.org/cmake/help/v3.8/prop_gbl/CMAKE_CXX_KNOWN_FEATURES.html#prop_gbl:CMAKE_CXX_KNOWN_FEATURES target_compile_features(BuildSettings INTERFACE cxx_std_11) # Generates an error in gradle build on Android + elseif(PLATFORM_ANDROID) + if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") target_compile_options(BuildSettings INTERFACE -std=c++11) elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU") - target_compile_options(BuildSettings INTERFACE -std=gnu++11) # Generates an error in gradle build on Android + target_compile_options(BuildSettings INTERFACE -std=gnu++11) else() message(WARNING "Unknown compiler") endif() diff --git a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt index bb257613..149817c2 100644 --- a/Graphics/GraphicsEngineOpenGL/CMakeLists.txt +++ b/Graphics/GraphicsEngineOpenGL/CMakeLists.txt @@ -150,7 +150,7 @@ elseif(PLATFORM_ANDROID) set(PRIVATE_DEPENDENCIES ${PRIVATE_DEPENDENCIES} GLESv3 EGL android) target_compile_definitions(GraphicsEngineOpenGL-static PRIVATE BUILDING_DLL USE_GL3_STUB=0) target_compile_definitions(GraphicsEngineOpenGL-shared PRIVATE BUILDING_DLL USE_GL3_STUB=0) - # LOCAL_CFLAGS := -fvisibility=hidden + set_target_properties(GraphicsEngineOpenGL-shared PROPERTIES CXX_VISIBILITY_PRESET hidden) # -fvisibility=hidden else() message(FATAL_ERROR "Unknown platform") endif() -- cgit v1.2.3