Remove redundant headers from the build system

Headers are not to be placed amongst the source files in the CMake
script. The preprocessor and the linker will take care of glue all the
files together. Also, the "include_directories()" statement at the top
of the file already tells CMake where to look for all the needed
header files.
This commit is contained in:
Gianluca Recchia 2018-10-27 21:39:50 +02:00
parent 4ae5ddf80f
commit 09fbb6d35a
No known key found for this signature in database
GPG key ID: 3C2B4128D9A1F218
2 changed files with 2 additions and 34 deletions

View file

@ -38,7 +38,6 @@ configure_file(version.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/version.h @ONLY)
set(keepassx_SOURCES set(keepassx_SOURCES
core/AutoTypeAssociations.cpp core/AutoTypeAssociations.cpp
core/AsyncTask.h
core/AutoTypeMatch.cpp core/AutoTypeMatch.cpp
core/Compare.cpp core/Compare.cpp
core/Config.cpp core/Config.cpp
@ -52,18 +51,14 @@ set(keepassx_SOURCES
core/EntrySearcher.cpp core/EntrySearcher.cpp
core/FilePath.cpp core/FilePath.cpp
core/Bootstrap.cpp core/Bootstrap.cpp
core/Global.h
core/Group.cpp core/Group.cpp
core/InactivityTimer.cpp core/InactivityTimer.cpp
core/ListDeleter.h
core/Merger.cpp core/Merger.cpp
core/Metadata.cpp core/Metadata.cpp
core/PasswordGenerator.cpp core/PasswordGenerator.cpp
core/PassphraseGenerator.cpp core/PassphraseGenerator.cpp
core/SignalMultiplexer.cpp core/SignalMultiplexer.cpp
core/ScreenLockListener.cpp core/ScreenLockListener.cpp
core/ScreenLockListener.h
core/ScreenLockListenerPrivate.h
core/ScreenLockListenerPrivate.cpp core/ScreenLockListenerPrivate.cpp
core/TimeDelta.cpp core/TimeDelta.cpp
core/TimeInfo.cpp core/TimeInfo.cpp
@ -77,14 +72,11 @@ set(keepassx_SOURCES
crypto/CryptoHash.cpp crypto/CryptoHash.cpp
crypto/Random.cpp crypto/Random.cpp
crypto/SymmetricCipher.cpp crypto/SymmetricCipher.cpp
crypto/SymmetricCipherBackend.h
crypto/SymmetricCipherGcrypt.cpp crypto/SymmetricCipherGcrypt.cpp
crypto/kdf/Kdf.cpp crypto/kdf/Kdf.cpp
crypto/kdf/Kdf_p.h
crypto/kdf/AesKdf.cpp crypto/kdf/AesKdf.cpp
crypto/kdf/Argon2Kdf.cpp crypto/kdf/Argon2Kdf.cpp
format/CsvExporter.cpp format/CsvExporter.cpp
format/KeePass1.h
format/KeePass1Reader.cpp format/KeePass1Reader.cpp
format/KeePass2.cpp format/KeePass2.cpp
format/KeePass2RandomStream.cpp format/KeePass2RandomStream.cpp
@ -142,7 +134,6 @@ set(keepassx_SOURCES
gui/entry/AutoTypeMatchModel.cpp gui/entry/AutoTypeMatchModel.cpp
gui/entry/AutoTypeMatchView.cpp gui/entry/AutoTypeMatchView.cpp
gui/entry/EditEntryWidget.cpp gui/entry/EditEntryWidget.cpp
gui/entry/EditEntryWidget_p.h
gui/entry/EntryAttachmentsModel.cpp gui/entry/EntryAttachmentsModel.cpp
gui/entry/EntryAttachmentsWidget.cpp gui/entry/EntryAttachmentsWidget.cpp
gui/entry/EntryAttributesModel.cpp gui/entry/EntryAttributesModel.cpp
@ -168,11 +159,8 @@ set(keepassx_SOURCES
gui/wizard/NewDatabaseWizardPageMetaData.cpp gui/wizard/NewDatabaseWizardPageMetaData.cpp
gui/wizard/NewDatabaseWizardPageEncryption.cpp gui/wizard/NewDatabaseWizardPageEncryption.cpp
gui/wizard/NewDatabaseWizardPageMasterKey.cpp gui/wizard/NewDatabaseWizardPageMasterKey.cpp
keys/ChallengeResponseKey.h
keys/CompositeKey.cpp keys/CompositeKey.cpp
keys/drivers/YubiKey.h
keys/FileKey.cpp keys/FileKey.cpp
keys/Key.h
keys/PasswordKey.cpp keys/PasswordKey.cpp
keys/YkChallengeResponseKey.cpp keys/YkChallengeResponseKey.cpp
streams/HashedBlockStream.cpp streams/HashedBlockStream.cpp
@ -181,27 +169,22 @@ set(keepassx_SOURCES
streams/qtiocompressor.cpp streams/qtiocompressor.cpp
streams/StoreDataStream.cpp streams/StoreDataStream.cpp
streams/SymmetricCipherStream.cpp streams/SymmetricCipherStream.cpp
totp/totp.h
totp/totp.cpp) totp/totp.cpp)
if(APPLE) if(APPLE)
set(keepassx_SOURCES set(keepassx_SOURCES
${keepassx_SOURCES} ${keepassx_SOURCES}
core/ScreenLockListenerMac.h
core/ScreenLockListenerMac.cpp core/ScreenLockListenerMac.cpp
core/MacPasteboard.h
core/MacPasteboard.cpp) core/MacPasteboard.cpp)
endif() endif()
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
set(keepassx_SOURCES set(keepassx_SOURCES
${keepassx_SOURCES} ${keepassx_SOURCES}
core/ScreenLockListenerDBus.h
core/ScreenLockListenerDBus.cpp core/ScreenLockListenerDBus.cpp
gui/MainWindowAdaptor.cpp) gui/MainWindowAdaptor.cpp)
endif() endif()
if(MINGW) if(MINGW)
set(keepassx_SOURCES set(keepassx_SOURCES
${keepassx_SOURCES} ${keepassx_SOURCES}
core/ScreenLockListenerWin.h
core/ScreenLockListenerWin.cpp) core/ScreenLockListenerWin.cpp)
endif() endif()
if(MINGW OR (UNIX AND NOT APPLE)) if(MINGW OR (UNIX AND NOT APPLE))
@ -243,13 +226,11 @@ set(autotype_SOURCES
core/Tools.cpp core/Tools.cpp
autotype/AutoType.cpp autotype/AutoType.cpp
autotype/AutoTypeAction.cpp autotype/AutoTypeAction.cpp
autotype/AutoTypePlatformPlugin.h
autotype/AutoTypeSelectDialog.cpp autotype/AutoTypeSelectDialog.cpp
autotype/AutoTypeSelectView.cpp autotype/AutoTypeSelectView.cpp
autotype/ShortcutWidget.cpp autotype/ShortcutWidget.cpp
autotype/WildcardMatcher.cpp autotype/WildcardMatcher.cpp
autotype/WindowSelectComboBox.cpp autotype/WindowSelectComboBox.cpp)
autotype/test/AutoTypeTestInterface.h)
if(MINGW) if(MINGW)
set(keepassx_SOURCES_MAINEXE ${keepassx_SOURCES_MAINEXE} ${CMAKE_SOURCE_DIR}/share/windows/icon.rc) set(keepassx_SOURCES_MAINEXE ${keepassx_SOURCES_MAINEXE} ${CMAKE_SOURCE_DIR}/share/windows/icon.rc)

View file

@ -15,31 +15,18 @@
set(cli_SOURCES set(cli_SOURCES
Add.cpp Add.cpp
Add.h
Clip.cpp Clip.cpp
Clip.h
Command.cpp Command.cpp
Command.h
Diceware.cpp Diceware.cpp
Diceware.h
Edit.cpp Edit.cpp
Edit.h
Estimate.cpp Estimate.cpp
Estimate.h
Extract.cpp Extract.cpp
Extract.h
Generate.cpp Generate.cpp
Generate.h
List.cpp List.cpp
List.h
Locate.cpp Locate.cpp
Locate.h
Merge.cpp Merge.cpp
Merge.h
Remove.cpp Remove.cpp
Remove.h Show.cpp)
Show.cpp
Show.h)
add_library(cli STATIC ${cli_SOURCES}) add_library(cli STATIC ${cli_SOURCES})
target_link_libraries(cli Qt5::Core Qt5::Widgets) target_link_libraries(cli Qt5::Core Qt5::Widgets)