|
|
|
@ -85,7 +85,6 @@ if(${CMAKE_VERSION} VERSION_LESS "3.14.0") |
|
|
|
|
message("Adding FetchContent_MakeAvailable") |
|
|
|
|
# from cmakes sources |
|
|
|
|
macro(FetchContent_MakeAvailable) |
|
|
|
|
|
|
|
|
|
foreach(contentName IN ITEMS ${ARGV}) |
|
|
|
|
string(TOLOWER ${contentName} contentNameLower) |
|
|
|
|
FetchContent_GetProperties(${contentName}) |
|
|
|
@ -103,7 +102,6 @@ if(${CMAKE_VERSION} VERSION_LESS "3.14.0") |
|
|
|
|
endif() |
|
|
|
|
endif() |
|
|
|
|
endforeach() |
|
|
|
|
|
|
|
|
|
endmacro() |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
@ -169,8 +167,7 @@ else() |
|
|
|
|
if(WIN32) |
|
|
|
|
pkg_check_modules(libevent_windows REQUIRED IMPORTED_TARGET libevent_windows) |
|
|
|
|
else() |
|
|
|
|
pkg_check_modules(libevent_pthreads REQUIRED IMPORTED_TARGET |
|
|
|
|
libevent_pthreads) |
|
|
|
|
pkg_check_modules(libevent_pthreads REQUIRED IMPORTED_TARGET libevent_pthreads) |
|
|
|
|
endif() |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
@ -225,7 +222,6 @@ else() |
|
|
|
|
pkg_check_modules(re2 REQUIRED IMPORTED_TARGET re2) |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# |
|
|
|
|
# LMDB |
|
|
|
|
# |
|
|
|
@ -511,7 +507,6 @@ set(SRC_FILES |
|
|
|
|
|
|
|
|
|
include(FeatureSummary) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(USE_BUNDLED_OPENSSL) |
|
|
|
|
hunter_add_package_safe(OpenSSL) |
|
|
|
|
endif() |
|
|
|
@ -587,7 +582,6 @@ else() |
|
|
|
|
/usr/local/include |
|
|
|
|
$ENV{LIB_DIR}/include |
|
|
|
|
$ENV{LIB_DIR}/include/lmdbxx) |
|
|
|
|
|
|
|
|
|
endif() |
|
|
|
|
add_library(lmdbxx INTERFACE) |
|
|
|
|
target_include_directories(lmdbxx INTERFACE ${LMDBXX_INCLUDE_DIR}) |
|
|
|
@ -816,7 +810,6 @@ qt_add_qml_module(nheko |
|
|
|
|
# #PREFIX "/" |
|
|
|
|
#) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
# |
|
|
|
|
# Bundle translations |
|
|
|
|
# |
|
|
|
@ -824,7 +817,6 @@ file(GLOB LANG_TS_SRC "${CMAKE_CURRENT_SOURCE_DIR}/resources/langs/*.ts") |
|
|
|
|
qt_add_translations(nheko RESOURCE_PREFIX "/translations" TS_FILES |
|
|
|
|
${LANG_TS_SRC} SOURCES ${QML_SOURCES} ${SRC_FILES}) |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(WIN32) |
|
|
|
|
target_compile_definitions(nheko PRIVATE WIN32_LEAN_AND_MEAN) |
|
|
|
|
if(MSVC) |
|
|
|
@ -910,12 +902,10 @@ if(MSVC) |
|
|
|
|
target_link_libraries(nheko PRIVATE ntdll) |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(QML_DEBUGGING) |
|
|
|
|
target_compile_definitions(nheko PRIVATE QML_DEBUGGING) |
|
|
|
|
endif() |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if(NOT MSVC AND NOT HAIKU) |
|
|
|
|
if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug" OR CI_BUILD) |
|
|
|
|
target_compile_options(nheko PRIVATE "-Werror") |
|
|
|
|