Try to fix CircleCI linux build
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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})
|
||||
|
||||
@@ -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());
|
||||
|
||||
|
||||
Reference in New Issue
Block a user