Skip to content
GitLab
Explorer
Connexion
Navigation principale
Rechercher ou aller à…
Projet
lektor
Gestion
Activité
Membres
Labels
Programmation
Tickets
Tableaux des tickets
Jalons
Code
Requêtes de fusion
Dépôt
Branches
Validations
Étiquettes
Graphe du dépôt
Comparer les révisions
Compilation
Pipelines
Jobs
Planifications de pipeline
Artéfacts
Aide
Aide
Support
Documentation de GitLab
Comparer les forfaits GitLab
Forum de la communauté
Contribuer à GitLab
Donner votre avis
Raccourcis clavier
?
Extraits de code
Groupes
Projets
Afficher davantage de fils d'Ariane
Kubat
lektor
Validations
75dd6419
Vérifiée
Valider
75dd6419
rédigé
2 years ago
par
Kubat
Parcourir les fichiers
Options
Téléchargements
Correctifs
Plain Diff
BUILD: Remove need for OpenMP
parent
4ac767d5
Aucune branche associée trouvée
Branches contenant la validation
Aucune étiquette associée trouvée
Étiquettes contenant la validation
1 requête de fusion
!198
Migrate from Qt5 to Qt6
Modifications
2
Masquer les modifications d'espaces
En ligne
Côte à côte
Affichage de
2 fichiers modifiés
CMakeLists.txt
+5
-21
5 ajouts, 21 suppressions
CMakeLists.txt
README.md
+0
-2
0 ajout, 2 suppressions
README.md
avec
5 ajouts
et
23 suppressions
CMakeLists.txt
+
5
−
21
Voir le fichier @
75dd6419
...
...
@@ -13,7 +13,6 @@ set(THREADS_PREFER_PTHREAD_FLAG ON)
set
(
CMAKE_COLOR_MAKEFILE ON
)
include
(
TestBigEndian
)
# Needed for endianness tests
include
(
FindOpenMP
)
# Test OpenMP support
include
(
GNUInstallDirs
)
# Needed for installation things
include
(
ExternalProject
)
# Enable ExternalProject CMake module
...
...
@@ -41,16 +40,6 @@ else()
set
(
RUST_BUILD_CMD
"
${
CARGO
}
"
build
)
endif
()
### ###
# TEST OPENMP #
### ###
if
(
OpenMP_FOUND
)
message
(
STATUS
"OpenMP found by CMake for C (version
${
OpenMP_C_VERSION
}
) and C++ (version
${
OpenMP_CXX_VERSION
}
)"
)
else
()
message
(
FATAL_ERROR
"OpenMP not found by CMake for C and C++"
)
endif
()
### ###
# SET COMMON VARIABLES #
### ###
...
...
@@ -77,7 +66,6 @@ set(COMMON_C_FLAGS
-Wdouble-promotion
-Wformat=2
-Wignored-qualifiers
${
OpenMP_C_FLAGS
}
)
set
(
Clang_C_FLAGS
-Weverything
...
...
@@ -117,11 +105,11 @@ set(GNU_C_FLAGS
# FIND DEPENDENCIES #
### ###
find_library
(
MPV_LIBRARY
mpv
REQUIRED
)
# tested with 0.32.0
find_library
(
SQLITE3_LIBRARY
sqlite3
REQUIRED version>=3.31.0
)
# tested with 3.34.1
find_library
(
MPV_LIBRARY mpv REQUIRED
)
# tested with 0.32.0
find_library
(
SQLITE3_LIBRARY sqlite3 REQUIRED version>=3.31.0
)
# tested with 3.34.1
find_package
(
CURL
REQUIRED
HTTP HTTPS
)
# tested with 7.74.0
find_package
(
Qt6
COMPONENTS
REQUIRED
Widgets OpenGL
)
find_package
(
CURL
COMPONENTS
HTTP HTTPS
REQUIRED
)
# tested with 7.74.0
find_package
(
Qt6 COMPONENTS Widgets OpenGL
REQUIRED
)
set
(
CMAKE_AUTOUIC ON
)
set
(
CMAKE_AUTOMOC ON
)
...
...
@@ -308,7 +296,6 @@ if(GENERATE_MANPAGES)
endif
()
target_link_libraries
(
lektord PRIVATE
${
OpenMP_C_LIBRARIES
}
${
MPV_LIBRARY
}
${
CMAKE_DL_LIBS
}
${
SQLITE3_LIBRARY
}
...
...
@@ -316,11 +303,8 @@ target_link_libraries(lektord PRIVATE
Qt::Widgets
Qt::OpenGL
)
target_link_libraries
(
lkt PRIVATE
${
OpenMP_C_LIBRARIES
}
)
target_include_directories
(
lkt PRIVATE
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc
)
target_include_directories
(
lkt
PRIVATE
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc
)
target_include_directories
(
lektord PRIVATE
${
CMAKE_CURRENT_SOURCE_DIR
}
/inc
${
CURL_INCLUDE_DIRS
}
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
README.md
+
0
−
2
Voir le fichier @
75dd6419
...
...
@@ -30,8 +30,6 @@ A Karaoke player made to replace the old bash scripts on Sakura.
-
[
cmake
](
https://cmake.org/
)
with at least the version 3.17
-
a C compiler with C11 support
-
a C++ compiler with C++20 support (for the Qt5 module)
-
The C and C++ compilers must have OpenMP support (see the
[
OpenMP C test program
](
utils/cmake/TestOpenMp.c
)
)
-
the
[
sqlite3
](
https://www.sqlite.org/
)
development library, version
3.
31.0 or newer for
[
generated columns
](
https://www.sqlite.org/gencol.html
)
support
-
a POSIX.1-2008 compatible system (for MS Windows, use something like WSL2)
...
...
Ce diff est replié.
Cliquez pour l'agrandir.
Aperçu
0%
Chargement en cours
Veuillez réessayer
ou
joindre un nouveau fichier
.
Annuler
You are about to add
0
people
to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Enregistrer le commentaire
Annuler
Veuillez vous
inscrire
ou vous
se connecter
pour commenter