Try to fix CircleCI linux build

This commit is contained in:
Lukas W
2020-05-06 12:38:12 +02:00
parent 68d7157c8e
commit 62606b64fe
3 changed files with 4 additions and 5 deletions

View File

@@ -171,9 +171,6 @@ ENDIF()
# Resolve Qt5::qmake to full path for use in packaging scripts
GET_TARGET_PROPERTY(QT_QMAKE_EXECUTABLE "${Qt5Core_QMAKE_EXECUTABLE}" IMPORTED_LOCATION)
FIND_PACKAGE(Qt5Test)
SET(QT_QTTEST_LIBRARY Qt5::Test)
# check for libsndfile
FIND_PACKAGE(SndFile REQUIRED)
IF(NOT SNDFILE_FOUND)

View File

@@ -6,6 +6,8 @@ INCLUDE_DIRECTORIES("${CMAKE_BINARY_DIR}/src")
SET(CMAKE_CXX_STANDARD 11)
FIND_PACKAGE(Qt5Test)
SET(CMAKE_AUTOMOC ON)
ADD_EXECUTABLE(tests
@@ -24,5 +26,5 @@ ADD_EXECUTABLE(tests
TARGET_COMPILE_DEFINITIONS(tests
PRIVATE $<TARGET_PROPERTY:lmmsobjs,INTERFACE_COMPILE_DEFINITIONS>
)
TARGET_LINK_LIBRARIES(tests ${QT_LIBRARIES} ${QT_QTTEST_LIBRARY})
TARGET_LINK_LIBRARIES(tests ${QT_LIBRARIES} Qt5::Test)
TARGET_LINK_LIBRARIES(tests ${LMMS_REQUIRED_LIBS})

View File

@@ -44,7 +44,7 @@ private slots:
ptrs.push(pool.allocate_bounded());
QVERIFY(ptrs.top());
}
QCOMPARE(pool.allocate_bounded(), nullptr);
QCOMPARE(pool.allocate_bounded(), static_cast<T*>(nullptr));
ptrs.push(pool.allocate());
QVERIFY(ptrs.top());