mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-15 23:12:14 -07:00
Link against (correct) new targets.
Took 5 minutes Took 30 seconds
This commit is contained in:
parent
6bc6b7c52b
commit
c05d2c8875
2 changed files with 5 additions and 14 deletions
|
|
@ -19,22 +19,13 @@ set(CMAKE_AUTORCC ON)
|
||||||
# ------------------------
|
# ------------------------
|
||||||
add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES})
|
add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_SOURCES})
|
||||||
|
|
||||||
# ------------------------
|
|
||||||
# Include directories
|
|
||||||
# ------------------------
|
|
||||||
target_include_directories(
|
|
||||||
dbconverter
|
|
||||||
PRIVATE ../common # shared common headers
|
|
||||||
PRIVATE ../libs/card/include # cardlib public headers
|
|
||||||
)
|
|
||||||
|
|
||||||
# ------------------------
|
# ------------------------
|
||||||
# Link libraries
|
# Link libraries
|
||||||
# ------------------------
|
# ------------------------
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
dbconverter
|
dbconverter
|
||||||
PRIVATE cardlib
|
PRIVATE libcockatrice_card
|
||||||
PRIVATE settingslib
|
PRIVATE libcockatrice_settings
|
||||||
PRIVATE ${DB_CONVERTER_QT_MODULES}
|
PRIVATE ${DB_CONVERTER_QT_MODULES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -44,7 +44,7 @@ endif()
|
||||||
# ------------------------
|
# ------------------------
|
||||||
# Include directories
|
# Include directories
|
||||||
# ------------------------
|
# ------------------------
|
||||||
include_directories(../cockatrice/libs/card/include ../cockatrice/libs/settings/include ../cockatrice/src ../common)
|
include_directories(../cockatrice/src)
|
||||||
|
|
||||||
# ------------------------
|
# ------------------------
|
||||||
# Optional libraries
|
# Optional libraries
|
||||||
|
|
@ -100,8 +100,8 @@ endif()
|
||||||
# ------------------------
|
# ------------------------
|
||||||
target_link_libraries(
|
target_link_libraries(
|
||||||
oracle
|
oracle
|
||||||
PRIVATE cardlib
|
PRIVATE libcockatrice_card
|
||||||
PRIVATE settingslib
|
PRIVATE libcockatrice_settings
|
||||||
PRIVATE ${ORACLE_QT_MODULES}
|
PRIVATE ${ORACLE_QT_MODULES}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue