Skip to content
Extraits de code Groupes Projets
Vérifiée Valider 75dd6419 rédigé par Kubat's avatar Kubat
Parcourir les fichiers

BUILD: Remove need for OpenMP

parent 4ac767d5
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!198Migrate from Qt5 to Qt6
......@@ -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}
......
......@@ -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)
......
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