mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-17 19:37:09 +02:00
Code Issues Releases Wiki Activity

Remove deprecated std::(tr1::) checks

Browse Source
This commit is contained in:
Uwe L. Korn
2014-09-17 20:53:02 +01:00
parent e160307dab
commit 2c1cf4719f
3 changed files with 0 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -250,16 +250,6 @@ else()
different compiler") different compiler")
endif() endif()
# Check if we can use <functional> or need <tr1/functional>
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_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") 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")

12
CMakeModules/CheckStdFunctional.cmake
View File

@@ -1,12 +0,0 @@
macro (CHECK_STD_FUNCTIONAL CXX_STD_FUNCTIONAL)
include (CheckCXXSourceCompiles)
check_cxx_source_compiles(
"
#include <functional>
using std::function;
int main()
{
return 0;
}" ${CXX_STD_FUNCTIONAL})
endmacro()

12
CMakeModules/CheckStdTr1Functional.cmake
View File

@@ -1,12 +0,0 @@
macro (CHECK_STD_TR1_FUNCTIONAL CXX_STD_TR1_FUNCTIONAL)
include (CheckCXXSourceCompiles)
check_cxx_source_compiles(
"
#include <tr1/functional>
using std::tr1::function;
int main()
{
return 0;
}" ${CXX_STD_TR1_FUNCTIONAL})
endmacro()