From 2c1cf4719f106f4181b38e8b1169a6ea88819e92 Mon Sep 17 00:00:00 2001 From: "Uwe L. Korn" Date: Wed, 17 Sep 2014 20:53:02 +0100 Subject: [PATCH] Remove deprecated std::(tr1::) checks --- CMakeLists.txt | 10 ---------- CMakeModules/CheckStdFunctional.cmake | 12 ------------ CMakeModules/CheckStdTr1Functional.cmake | 12 ------------ 3 files changed, 34 deletions(-) delete mode 100644 CMakeModules/CheckStdFunctional.cmake delete mode 100644 CMakeModules/CheckStdTr1Functional.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 4df65a4f7..b5a956578 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -250,16 +250,6 @@ else() different compiler") endif() -# Check if we can use or need -include( CheckStdFunctional ) -check_std_functional( CXX_STD_FUNCTIONAL ) -include( CheckStdTr1Functional ) -check_std_tr1_functional( CXX_STD_TR1_FUNCTIONAL ) -if ( NOT CXX_STD_FUNCTIONAL AND NOT CXX_STD_TR1_FUNCTIONAL ) - message( FATAL_ERROR - "Used compiler neither provides std::function nor std::tr1::function") -endif() - macro_optional_find_package(Echonest 2.2.0) macro_log_feature(ECHONEST_FOUND "Echonest" "Qt library for communicating with The Echo Nest" "http://projects.kde.org/libechonest" TRUE "" "libechonest 2.2.0 is needed for dynamic playlists and the infosystem") diff --git a/CMakeModules/CheckStdFunctional.cmake b/CMakeModules/CheckStdFunctional.cmake deleted file mode 100644 index b0bbc28d1..000000000 --- a/CMakeModules/CheckStdFunctional.cmake +++ /dev/null @@ -1,12 +0,0 @@ -macro (CHECK_STD_FUNCTIONAL CXX_STD_FUNCTIONAL) - include (CheckCXXSourceCompiles) - check_cxx_source_compiles( - " - #include - using std::function; - int main() - { - return 0; - }" ${CXX_STD_FUNCTIONAL}) -endmacro() - diff --git a/CMakeModules/CheckStdTr1Functional.cmake b/CMakeModules/CheckStdTr1Functional.cmake deleted file mode 100644 index f28484e2d..000000000 --- a/CMakeModules/CheckStdTr1Functional.cmake +++ /dev/null @@ -1,12 +0,0 @@ -macro (CHECK_STD_TR1_FUNCTIONAL CXX_STD_TR1_FUNCTIONAL) - include (CheckCXXSourceCompiles) - check_cxx_source_compiles( - " - #include - using std::tr1::function; - int main() - { - return 0; - }" ${CXX_STD_TR1_FUNCTIONAL}) -endmacro() -