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

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 40dcf6bc
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
......@@ -41,6 +41,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)
# Add the lua dependency
add_subdirectory(
......@@ -73,6 +74,7 @@ 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 lua)
target_link_libraries(Vivy PRIVATE OpenMP::OpenMP_CXX)
# Headers related things
include("${CMAKE_CURRENT_SOURCE_DIR}/PreCompiledHeaders.cmake")
......@@ -118,8 +120,6 @@ target_compile_options(Vivy PRIVATE
-Wno-unused-parameter
)
target_link_libraries(Vivy PRIVATE -fopenmp)
# Prepare for Qt6
target_compile_definitions(Vivy PRIVATE
QT_DISABLE_DEPRECATED_BEFORE=0x050F00
......@@ -146,12 +146,8 @@ if (${CMAKE_CXX_COMPILER_ID} STREQUAL "Clang")
-Wno-global-constructors
-Wno-exit-time-destructors
)
target_link_libraries(Vivy PRIVATE
-fopenmp
)
elseif (${CMAKE_CXX_COMPILER_ID} STREQUAL "GNU")
target_compile_options(Vivy PRIVATE
-fopenmp
-Wno-subobject-linkage # Kubat: Some proglems here, it seems they
# occure because of the usage of "using" for
# type aliasing... As I won't get ride of the
......
......@@ -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