From ad893e13ebb9b9f75a0c0cf0146a8c10c48b85c7 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Fri, 13 Oct 2017 23:24:50 -0700 Subject: [PATCH] Remove unused ALURE_USE_RTTI option --- CMakeLists.txt | 17 +++++++---------- config.h.in | 3 --- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 8b87ea0..f1a59f8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,6 @@ include(CheckCXXSourceCompiles) find_package(OpenAL REQUIRED) -option(ALURE_USE_RTTI "Enable run-time type information" OFF) option(ALURE_STATIC_GCCRT "Static-link libgcc and libstdc++ runtimes" OFF) set(CXX_FLAGS ) @@ -34,15 +33,13 @@ if(HAVE_WEXTRA_SWITCH) set(CXX_FLAGS ${CXX_FLAGS} -Wextra) endif() -if(NOT ALURE_USE_RTTI) - check_cxx_compiler_flag(-fno-rtti HAVE_NO_RTTI_SWITCH) - if(HAVE_NO_RTTI_SWITCH) - set(CXX_FLAGS ${CXX_FLAGS} -fno-rtti) - else() - check_cxx_compiler_flag(/GR- HAVE_GRX_SWITCH) - if(HAVE_GRX_SWITCH) - set(CXX_FLAGS ${CXX_FLAGS} /GR-) - endif() +check_cxx_compiler_flag(-fno-rtti HAVE_NO_RTTI_SWITCH) +if(HAVE_NO_RTTI_SWITCH) + set(CXX_FLAGS ${CXX_FLAGS} -fno-rtti) +else() + check_cxx_compiler_flag(/GR- HAVE_GRX_SWITCH) + if(HAVE_GRX_SWITCH) + set(CXX_FLAGS ${CXX_FLAGS} /GR-) endif() endif() diff --git a/config.h.in b/config.h.in index e73f1ba..0e78dc3 100644 --- a/config.h.in +++ b/config.h.in @@ -1,6 +1,3 @@ -/* Define if we can use RTTI */ -#cmakedefine ALURE_USE_RTTI - /* Define if we have vorbisfile support */ #cmakedefine HAVE_VORBISFILE -- 2.11.4.GIT