patches from Vae about making libraries static, and about boost, findLMDB CMake script, drop dependency for qtquickcontrols

This commit is contained in:
Blue 2021-05-09 02:12:17 +03:00
parent f45319de25
commit ce047db787
8 changed files with 59 additions and 10 deletions

View file

@ -1,12 +1,15 @@
cmake_minimum_required(VERSION 3.0)
cmake_minimum_required(VERSION 3.3)
project(squawkCORE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake")
set(CMAKE_AUTOMOC ON)
find_package(Qt5Core CONFIG REQUIRED)
find_package(Qt5Gui CONFIG REQUIRED)
find_package(Qt5Network CONFIG REQUIRED)
find_package(Qt5Xml CONFIG REQUIRED)
find_package(LMDB REQUIRED)
set(squawkCORE_SRC
squawk.cpp
@ -25,7 +28,7 @@ set(squawkCORE_SRC
add_subdirectory(passwordStorageEngines)
# Tell CMake to create the helloworld executable
add_library(squawkCORE ${squawkCORE_SRC})
add_library(squawkCORE STATIC ${squawkCORE_SRC})
if(SYSTEM_QXMPP)

View file

@ -14,7 +14,7 @@ if (WITH_KWALLET)
kwallet.cpp
)
add_library(kwalletPSE ${kwalletPSE_SRC})
add_library(kwalletPSE STATIC ${kwalletPSE_SRC})
target_include_directories(kwalletPSE PUBLIC ${KWALLET_INTERFACE_INCLUDE_DIRECTORIES})
target_include_directories(kwalletPSE PUBLIC ${Qt5GUI_INTERFACE_INCLUDE_DIRECTORIES})