From 7a42d331bd9cf0e754105d41b42abfa8a625bf86 Mon Sep 17 00:00:00 2001 From: Antony Woods Date: Wed, 16 Oct 2013 09:09:22 +0100 Subject: Fixed invalid header in python files. Now using chrono instead of boost timer. Removed unnecessary ptr checks, as now shared ptr is mandatory. Updated Readme to reflect new changes. Updated travis file, just in case. --- CheckCXX11SharedPtr.cmake | 54 ----------------------------------------------- 1 file changed, 54 deletions(-) delete mode 100644 CheckCXX11SharedPtr.cmake (limited to 'CheckCXX11SharedPtr.cmake') diff --git a/CheckCXX11SharedPtr.cmake b/CheckCXX11SharedPtr.cmake deleted file mode 100644 index 0dc3281..0000000 --- a/CheckCXX11SharedPtr.cmake +++ /dev/null @@ -1,54 +0,0 @@ -cmake_minimum_required(VERSION 2.8.3) - -if (ENTITYX_USE_CPP11_STDLIB) - add_definitions(-DGTEST_USE_OWN_TR1_TUPLE=1) - set(OLD_CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -stdlib=libc++") - check_cxx_source_compiles( - " - #include - - int main() { - std::shared_ptr(); - } - " - ENTITYX_HAVE_CXX11_STDLIB - ) - - if (NOT ENTITYX_HAVE_CXX11_STDLIB) - message("-- Not using -stdlib=libc++ (test failed to build)") - set(CMAKE_CXX_FLAGS "${OLD_CMAKE_CXX_FLAGS}") - else () - message("-- Using -stdlib=libc++") - endif () -else () - message("-- Using default stdlib (try -DENTITYX_USE_CPP11_STDLIB=1 to use -stdlib=libc++)") -endif () - -check_cxx_source_compiles( -" -#include - -int main() { std::shared_ptr(); } -" -ENTITYX_HAVE_STD_SHARED_PTR -) - -check_cxx_source_compiles( -" -#include - -int main() { boost::shared_ptr(); } -" -ENTITYX_HAVE_BOOST_SHARED_PTR -) - -if (ENTITYX_HAVE_STD_SHARED_PTR AND ENTITYX_USE_STD_SHARED_PTR) - message("-- Using std::shared_ptr") -else() - if (ENTITYX_USE_STD_SHARED_PTR) - message("-- Using boost::shared_ptr (std::shared_ptr could not be used)") - else() - message("-- Using boost::shared_ptr (try -DENTITYX_USE_STD_SHARED_PTR=1 to use std::shared_ptr)") - endif() -endif() -- cgit v1.2.3