Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Check for lambda support before using it.

This commit is contained in:
John Maguire 2012-11-26 15:36:05 +01:00
parent 303ef3ce2f
commit 875b297278
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -25,8 +25,15 @@ check_cxx_source_compiles(
} }
" "
USE_STD_UNORDERED_MAP) USE_STD_UNORDERED_MAP)
check_cxx_source_compiles(
"int main() {
[](){}();
}
"
HAVE_LAMBDAS)
unset(CMAKE_REQUIRED_FLAGS) unset(CMAKE_REQUIRED_FLAGS)
if (UNIX AND NOT APPLE) if (UNIX AND NOT APPLE)
set(LINUX 1) set(LINUX 1)
endif (UNIX AND NOT APPLE) endif (UNIX AND NOT APPLE)

1
src/config.h.in
View File

@ -44,5 +44,6 @@
#cmakedefine USE_INSTALL_PREFIX #cmakedefine USE_INSTALL_PREFIX
#cmakedefine USE_SYSTEM_PROJECTM #cmakedefine USE_SYSTEM_PROJECTM
#cmakedefine USE_STD_UNORDERED_MAP #cmakedefine USE_STD_UNORDERED_MAP
#cmakedefine HAVE_LAMBDAS
#endif // CONFIG_H_IN #endif // CONFIG_H_IN

3
tests/closure_test.cpp
View File

@ -5,6 +5,7 @@
#include <QSharedPointer> #include <QSharedPointer>
#include <QSignalSpy> #include <QSignalSpy>
#include "config.h"
#include "core/closure.h" #include "core/closure.h"
#include "test_utils.h" #include "test_utils.h"
@ -63,6 +64,7 @@ TEST(ClosureTest, ClosureDoesNotCrashWithSharedPointerSender) {
EXPECT_TRUE(closure.isNull()); EXPECT_TRUE(closure.isNull());
} }
#ifdef HAVE_LAMBDAS
TEST(ClosureTest, ClosureCallsLambda) { TEST(ClosureTest, ClosureCallsLambda) {
TestQObject sender; TestQObject sender;
bool called = false; bool called = false;
@ -73,3 +75,4 @@ TEST(ClosureTest, ClosureCallsLambda) {
sender.Emit(); sender.Emit();
EXPECT_TRUE(called); EXPECT_TRUE(called);
} }
#endif // HAVE_LAMBDAS