jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 06:22:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Things don't need to manually include utility headers if they already link against it. Settings should link against utility. Deck_List needs pb generated files.

Browse source 
Took 10 minutes
This commit is contained in:
Lukas Brübach 2025-10-04 21:02:19 +02:00
parent fc4dbfeec4
commit d946d6a3ec
5 changed files with 3 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libs/card/CMakeLists.txt
View file

@ -57,7 +57,6 @@ add_library(cockatrice_card STATIC
target_include_directories(cockatrice_card target_include_directories(cockatrice_card
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_SOURCE_DIR}/libs/settings/include
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/filters
) )

2
libs/deck_list/CMakeLists.txt
View file

@ -27,7 +27,7 @@ add_library(cockatrice_deck_list STATIC
target_include_directories(cockatrice_deck_list target_include_directories(cockatrice_deck_list
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
) )
target_link_libraries(cockatrice_deck_list target_link_libraries(cockatrice_deck_list

2
libs/server/CMakeLists.txt
View file

@ -56,8 +56,6 @@ add_library(cockatrice_server STATIC
target_include_directories(cockatrice_server target_include_directories(cockatrice_server
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_SOURCE_DIR}/libs/pb
PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility
PUBLIC ${CMAKE_BINARY_DIR}/libs/pb PUBLIC ${CMAKE_BINARY_DIR}/libs/pb
) )

3
libs/settings/CMakeLists.txt
View file

@ -46,10 +46,9 @@ add_library(cockatrice_settings STATIC
target_include_directories(cockatrice_settings target_include_directories(cockatrice_settings
PUBLIC include PUBLIC include
PUBLIC ${CMAKE_SOURCE_DIR}/common PUBLIC ${CMAKE_SOURCE_DIR}/common
PUBLIC ${CMAKE_SOURCE_DIR}/libs/utility/include
PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network PUBLIC ${CMAKE_SOURCE_DIR}/cockatrice/src/client/network
) )
target_link_libraries(cockatrice_settings target_link_libraries(cockatrice_settings
PUBLIC cockatrice_common ${COCKATRICE_QT_MODULES} PUBLIC cockatrice_common utility ${COCKATRICE_QT_MODULES}
) )

2
libs/settings/include/settings/cache_settings.h
View file

@ -17,13 +17,13 @@
#include "recents_settings.h" #include "recents_settings.h"
#include "servers_settings.h" #include "servers_settings.h"
#include "shortcuts_settings.h" #include "shortcuts_settings.h"
#include "utility/macros.h"
#include <QDate> #include <QDate>
#include <QLoggingCategory> #include <QLoggingCategory>
#include <QObject> #include <QObject>
#include <QSize> #include <QSize>
#include <QStringList> #include <QStringList>
#include <utility/macros.h>
inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache"); inline Q_LOGGING_CATEGORY(SettingsCacheLog, "settings_cache");