diff --git a/CMakeLists.txt b/CMakeLists.txt index 017fdb359e34ef0176e0aa14b48b3711be12d000..ea0c5bac422ca863279f98fab92c20c0600da0a9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -43,6 +43,7 @@ find_library(AVUTIL_LIBRARY avutil 4.0 REQUIRED) find_library(SWRESAMPLE_LIBRARY swresample REQUIRED) find_library(AVFORMAT_LIBRARY avformat REQUIRED) find_library(MPV_LIBRARY mpv REQUIRED) +find_package( OpenMP REQUIRED) # Grab all files file(GLOB_RECURSE Vivy_SRC CONFIGURE_DEPENDS "${CMAKE_CURRENT_SOURCE_DIR}/src/*.cc") @@ -70,6 +71,7 @@ target_link_libraries(Vivy PRIVATE ${AVUTIL_LIBRARY}) target_link_libraries(Vivy PRIVATE ${SWRESAMPLE_LIBRARY}) target_link_libraries(Vivy PRIVATE ${AVFORMAT_LIBRARY}) target_link_libraries(Vivy PRIVATE ${MPV_LIBRARY}) +target_link_libraries(Vivy PRIVATE OpenMP::OpenMP_CXX) # Headers related things include("${CMAKE_CURRENT_SOURCE_DIR}/PreCompiledHeaders.cmake") diff --git a/src/Lib/JsonBuilder.hh b/src/Lib/JsonBuilder.hh index 6afa29365c3bb9ac6b5e33d33bd371ecb1078d90..103187e0f32cdc14883af0093bbe1ded7f51afeb 100644 --- a/src/Lib/JsonBuilder.hh +++ b/src/Lib/JsonBuilder.hh @@ -21,9 +21,9 @@ struct JsonBuilder final { getSubDocumentJson(const QString &name, std::shared_ptr<T> subDocPtr) noexcept { if (subDocPtr == nullptr) - return QPair{ name, QJsonValue() }; + return QPair<QString, QJsonValue>{ name, QJsonValue() }; else - return QPair{ name, subDocPtr->getProperties().object() }; + return QPair<QString, QJsonValue>{ name, subDocPtr->getProperties().object() }; } private: