Skip to content
Extraits de code Groupes Projets
Valider c671b510 rédigé par Elliu's avatar Elliu
Parcourir les fichiers

BUILD: fix compilation on clang (openmp)

Search for openmp in find_package, to prevent fail at linkage if llvm
openmp is missing from system
Add explicit template specialization for QPair
parent 1d1ec318
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -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")
......
......@@ -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:
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter