mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-06 05:57:37 +03:00
Code Issues Projects Releases Packages Wiki Activity

Reformat CMakeLists.txt files

Browse source
This commit is contained in:
Janek Bevendorff 2018-10-19 21:41:56 +02:00
parent 0ca7fd369a
commit 77adbef401
13 changed files with 659 additions and 676 deletions
Download patch file Download diff file Expand all files Collapse all files

15
CMakeLists.txt
View file

@ -1,4 +1,4 @@
# Copyright (C) 2017 KeePassXC Team <team@keepassxc.org> # Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
# Copyright (C) 2010 Felix Geyer <debfx@fobos.de> # Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
@ -302,17 +302,14 @@ endif()
include(CLangFormat) include(CLangFormat)
set(QT_COMPONENTS Core Network Concurrent Gui Svg Widgets Test LinguistTools)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
find_package(Qt5 COMPONENTS Core Network Concurrent Gui Svg Widgets Test LinguistTools DBus REQUIRED) find_package(Qt5 COMPONENTS ${QT_COMPONENTS} DBus REQUIRED)
elseif(APPLE) elseif(APPLE)
find_package(Qt5 COMPONENTS Core Network Concurrent Gui Svg Widgets Test LinguistTools REQUIRED find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED HINTS /usr/local/Cellar/qt/*/lib/cmake ENV PATH)
HINTS /usr/local/Cellar/qt/*/lib/cmake ENV PATH find_package(Qt5 COMPONENTS MacExtras HINTS /usr/local/Cellar/qt/*/lib/cmake ENV PATH)
)
find_package(Qt5 COMPONENTS MacExtras
HINTS /usr/local/Cellar/qt/*/lib/cmake ENV PATH
)
else() else()
find_package(Qt5 COMPONENTS Core Network Concurrent Gui Svg Widgets Test LinguistTools REQUIRED) find_package(Qt5 COMPONENTS ${QT_COMPONENTS} REQUIRED)
endif() endif()
if(Qt5Core_VERSION VERSION_LESS "5.2.0") if(Qt5Core_VERSION VERSION_LESS "5.2.0")

6
cmake/CLangFormat.cmake
View file

@ -18,8 +18,7 @@ set(EXCLUDED_DIRS
zxcvbn/ zxcvbn/
streams/QtIOCompressor streams/QtIOCompressor
# objective-c directories # objective-c directories
autotype/mac autotype/mac)
)
set(EXCLUDED_FILES set(EXCLUDED_FILES
# third-party files # third-party files
@ -36,8 +35,7 @@ set(EXCLUDED_FILES
tests/modeltest.h tests/modeltest.h
# objective-c files # objective-c files
core/ScreenLockListenerMac.h core/ScreenLockListenerMac.h
core/ScreenLockListenerMac.cpp core/ScreenLockListenerMac.cpp)
)
file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h) file(GLOB_RECURSE ALL_SOURCE_FILES *.cpp *.h)
foreach(SOURCE_FILE ${ALL_SOURCE_FILES}) foreach(SOURCE_FILE ${ALL_SOURCE_FILES})

31
src/CMakeLists.txt
View file

@ -1,4 +1,4 @@
# Copyright (C) 2017 KeePassXC Team <team@keepassxc.org> # Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
# Copyright (C) 2010 Felix Geyer <debfx@fobos.de> # Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
@ -185,30 +185,28 @@ set(keepassx_SOURCES
totp/totp.h totp/totp.h
totp/totp.cpp) totp/totp.cpp)
if(APPLE) if(APPLE)
set(keepassx_SOURCES ${keepassx_SOURCES} set(keepassx_SOURCES
${keepassx_SOURCES}
core/ScreenLockListenerMac.h core/ScreenLockListenerMac.h
core/ScreenLockListenerMac.cpp core/ScreenLockListenerMac.cpp
core/MacPasteboard.h core/MacPasteboard.h
core/MacPasteboard.cpp core/MacPasteboard.cpp)
)
endif() endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set(keepassx_SOURCES ${keepassx_SOURCES} set(keepassx_SOURCES
${keepassx_SOURCES}
core/ScreenLockListenerDBus.h core/ScreenLockListenerDBus.h
core/ScreenLockListenerDBus.cpp core/ScreenLockListenerDBus.cpp
gui/MainWindowAdaptor.cpp gui/MainWindowAdaptor.cpp)
)
endif() endif()
if(MINGW) if(MINGW)
set(keepassx_SOURCES ${keepassx_SOURCES} set(keepassx_SOURCES
${keepassx_SOURCES}
core/ScreenLockListenerWin.h core/ScreenLockListenerWin.h
core/ScreenLockListenerWin.cpp core/ScreenLockListenerWin.cpp)
)
endif() endif()
set(keepassx_SOURCES_MAINEXE set(keepassx_SOURCES_MAINEXE main.cpp)
main.cpp
)
add_feature_info(Auto-Type WITH_XC_AUTOTYPE "Automatic password typing") add_feature_info(Auto-Type WITH_XC_AUTOTYPE "Automatic password typing")
add_feature_info(Networking WITH_XC_NETWORKING "Compile KeePassXC with network access code (e.g. for downloading website icons)") add_feature_info(Networking WITH_XC_NETWORKING "Compile KeePassXC with network access code (e.g. for downloading website icons)")
@ -246,13 +244,10 @@ set(autotype_SOURCES
autotype/ShortcutWidget.cpp autotype/ShortcutWidget.cpp
autotype/WildcardMatcher.cpp autotype/WildcardMatcher.cpp
autotype/WindowSelectComboBox.cpp autotype/WindowSelectComboBox.cpp
autotype/test/AutoTypeTestInterface.h autotype/test/AutoTypeTestInterface.h)
)
if(MINGW) if(MINGW)
set(keepassx_SOURCES_MAINEXE set(keepassx_SOURCES_MAINEXE ${keepassx_SOURCES_MAINEXE} ${CMAKE_SOURCE_DIR}/share/windows/icon.rc)
${keepassx_SOURCES_MAINEXE}
${CMAKE_SOURCE_DIR}/share/windows/icon.rc)
endif() endif()
if(WITH_XC_YUBIKEY) if(WITH_XC_YUBIKEY)

8
src/autotype/mac/CMakeLists.txt
View file

@ -1,10 +1,6 @@
set(autotype_mac_SOURCES set(autotype_mac_SOURCES AutoTypeMac.cpp)
AutoTypeMac.cpp
)
set(autotype_mac_mm_SOURCES set(autotype_mac_mm_SOURCES AppKitImpl.mm)
AppKitImpl.mm
)
add_library(keepassx-autotype-cocoa MODULE ${autotype_mac_SOURCES} ${autotype_mac_mm_SOURCES}) add_library(keepassx-autotype-cocoa MODULE ${autotype_mac_SOURCES} ${autotype_mac_mm_SOURCES})
set_target_properties(keepassx-autotype-cocoa PROPERTIES LINK_FLAGS "-framework Foundation -framework AppKit -framework Carbon") set_target_properties(keepassx-autotype-cocoa PROPERTIES LINK_FLAGS "-framework Foundation -framework AppKit -framework Carbon")

4
src/autotype/test/CMakeLists.txt
View file

@ -1,6 +1,4 @@
set(autotype_test_SOURCES set(autotype_test_SOURCES AutoTypeTest.cpp)
AutoTypeTest.cpp
)
add_library(keepassx-autotype-test MODULE ${autotype_test_SOURCES}) add_library(keepassx-autotype-test MODULE ${autotype_test_SOURCES})
target_link_libraries(keepassx-autotype-test keepassx_core ${autotype_LIB} Qt5::Core Qt5::Widgets) target_link_libraries(keepassx-autotype-test keepassx_core ${autotype_LIB} Qt5::Core Qt5::Widgets)

4
src/autotype/windows/CMakeLists.txt
View file

@ -1,6 +1,4 @@
set(autotype_win_SOURCES set(autotype_win_SOURCES AutoTypeWindows.cpp)
AutoTypeWindows.cpp
)
add_library(keepassx-autotype-windows MODULE ${autotype_win_SOURCES}) add_library(keepassx-autotype-windows MODULE ${autotype_win_SOURCES})
target_link_libraries(keepassx-autotype-windows keepassx_core ${autotype_LIB} Qt5::Core Qt5::Widgets) target_link_libraries(keepassx-autotype-windows keepassx_core ${autotype_LIB} Qt5::Core Qt5::Widgets)

4
src/autotype/xcb/CMakeLists.txt
View file

@ -1,8 +1,6 @@
include_directories(SYSTEM ${X11_X11_INCLUDE_PATH}) include_directories(SYSTEM ${X11_X11_INCLUDE_PATH})
set(autotype_XCB_SOURCES set(autotype_XCB_SOURCES AutoTypeXCB.cpp)
AutoTypeXCB.cpp
)
add_library(keepassx-autotype-xcb MODULE ${autotype_XCB_SOURCES}) add_library(keepassx-autotype-xcb MODULE ${autotype_XCB_SOURCES})
target_link_libraries(keepassx-autotype-xcb keepassx_core Qt5::Core Qt5::Widgets Qt5::X11Extras ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_XTest_LIB}) target_link_libraries(keepassx-autotype-xcb keepassx_core Qt5::Core Qt5::Widgets Qt5::X11Extras ${X11_X11_LIB} ${X11_Xi_LIB} ${X11_XTest_LIB})

3
src/browser/CMakeLists.txt
View file

@ -30,8 +30,7 @@ if(WITH_XC_BROWSER)
HostInstaller.cpp HostInstaller.cpp
NativeMessagingBase.cpp NativeMessagingBase.cpp
NativeMessagingHost.cpp NativeMessagingHost.cpp
Variant.cpp Variant.cpp)
)
add_library(keepassxcbrowser STATIC ${keepassxcbrowser_SOURCES}) add_library(keepassxcbrowser STATIC ${keepassxcbrowser_SOURCES})
target_link_libraries(keepassxcbrowser Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network sodium) target_link_libraries(keepassxcbrowser Qt5::Core Qt5::Concurrent Qt5::Widgets Qt5::Network sodium)

12
tests/CMakeLists.txt
View file

@ -1,3 +1,4 @@
# Copyright (C) 2018 KeePassXC Team <team@keepassxc.org>
# Copyright (C) 2010 Felix Geyer <debfx@fobos.de> # Copyright (C) 2010 Felix Geyer <debfx@fobos.de>
# #
# This program is free software: you can redistribute it and/or modify # This program is free software: you can redistribute it and/or modify
@ -13,7 +14,11 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
include_directories(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR}/src ${CMAKE_CURRENT_BINARY_DIR}/../src) include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_SOURCE_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}/../src)
add_definitions(-DQT_TEST_LIB) add_definitions(-DQT_TEST_LIB)
@ -92,8 +97,7 @@ set(TEST_LIBRARIES
Qt5::Test Qt5::Test
${GCRYPT_LIBRARIES} ${GCRYPT_LIBRARIES}
${GPGERROR_LIBRARIES} ${GPGERROR_LIBRARIES}
${ZLIB_LIBRARIES} ${ZLIB_LIBRARIES})
)
set(testsupport_SOURCES TestGlobal.h modeltest.cpp FailDevice.cpp mock/MockClock.cpp util/TemporaryFile.cpp) set(testsupport_SOURCES TestGlobal.h modeltest.cpp FailDevice.cpp mock/MockClock.cpp util/TemporaryFile.cpp)
add_library(testsupport STATIC ${testsupport_SOURCES}) add_library(testsupport STATIC ${testsupport_SOURCES})
@ -183,7 +187,7 @@ add_unit_test(NAME testrandom SOURCES TestRandom.cpp
add_unit_test(NAME testentrysearcher SOURCES TestEntrySearcher.cpp add_unit_test(NAME testentrysearcher SOURCES TestEntrySearcher.cpp
LIBS ${TEST_LIBRARIES}) LIBS ${TEST_LIBRARIES})
add_unit_test(NAME testcsveporter SOURCES TestCsvExporter.cpp add_unit_test(NAME testcsvexporter SOURCES TestCsvExporter.cpp
LIBS ${TEST_LIBRARIES}) LIBS ${TEST_LIBRARIES})
add_unit_test(NAME testykchallengeresponsekey add_unit_test(NAME testykchallengeresponsekey