From 37655a31070220577441d5623d08c33aed26f03e Mon Sep 17 00:00:00 2001 From: vae Date: Sun, 9 May 2021 00:35:34 +0300 Subject: [PATCH 1/3] chore: add gitignore --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9d07ce9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +cmake-build-debug +build +.idea \ No newline at end of file -- 2.44.0 From e1ad016bb590612a67b2296e1d6a9ad1b67f9e22 Mon Sep 17 00:00:00 2001 From: vae Date: Sun, 9 May 2021 00:35:47 +0300 Subject: [PATCH 2/3] build: fix build on Gentoo --- ui/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 00570c9..8e93485 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -8,7 +8,7 @@ set(CMAKE_AUTOUIC ON) # Find the QtWidgets library find_package(Qt5 CONFIG REQUIRED COMPONENTS Widgets DBus Core) -find_package(Boost 1.36.0 CONFIG REQUIRED COMPONENTS +find_package(Boost 1.36.0 REQUIRED COMPONENTS date_time filesystem iostreams) if(Boost_FOUND) include_directories(${Boost_INCLUDE_DIRS}) -- 2.44.0 From 58f57f746ccb54082303fd5e22c73e4f03c70f69 Mon Sep 17 00:00:00 2001 From: vae Date: Sun, 9 May 2021 01:22:14 +0300 Subject: [PATCH 3/3] build: static libraries --- core/CMakeLists.txt | 2 +- core/passwordStorageEngines/CMakeLists.txt | 2 +- external/simpleCrypt/CMakeLists.txt | 2 +- ui/CMakeLists.txt | 2 +- ui/widgets/vcard/CMakeLists.txt | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 2e832e2..2f6ce48 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -25,7 +25,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) diff --git a/core/passwordStorageEngines/CMakeLists.txt b/core/passwordStorageEngines/CMakeLists.txt index ec750d9..735c0ad 100644 --- a/core/passwordStorageEngines/CMakeLists.txt +++ b/core/passwordStorageEngines/CMakeLists.txt @@ -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}) diff --git a/external/simpleCrypt/CMakeLists.txt b/external/simpleCrypt/CMakeLists.txt index bdb62c6..88f5d23 100644 --- a/external/simpleCrypt/CMakeLists.txt +++ b/external/simpleCrypt/CMakeLists.txt @@ -10,7 +10,7 @@ set(simplecrypt_SRC ) # Tell CMake to create the helloworld executable -add_library(simpleCrypt ${simplecrypt_SRC}) +add_library(simpleCrypt STATIC ${simplecrypt_SRC}) # Use the Widgets module from Qt 5. target_link_libraries(simpleCrypt Qt5::Core) diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 8e93485..4c0bfd8 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -35,7 +35,7 @@ set(squawkUI_SRC ) # Tell CMake to create the helloworld executable -add_library(squawkUI ${squawkUI_SRC}) +add_library(squawkUI STATIC ${squawkUI_SRC}) # Use the Widgets module from Qt 5. target_link_libraries(squawkUI squawkWidgets) diff --git a/ui/widgets/vcard/CMakeLists.txt b/ui/widgets/vcard/CMakeLists.txt index 4d2ee15..73b157c 100644 --- a/ui/widgets/vcard/CMakeLists.txt +++ b/ui/widgets/vcard/CMakeLists.txt @@ -16,7 +16,7 @@ set(vCardUI_SRC ) # Tell CMake to create the helloworld executable -add_library(vCardUI ${vCardUI_SRC}) +add_library(vCardUI STATIC ${vCardUI_SRC}) # Use the Widgets module from Qt 5. target_link_libraries(vCardUI Qt5::Widgets) -- 2.44.0