mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-14 22:42:14 -07:00
fix build failure
This commit is contained in:
parent
63b8540ea7
commit
9a8271ed35
3 changed files with 6 additions and 2 deletions
|
|
@ -26,6 +26,9 @@ elseif(Qt5_FOUND)
|
||||||
)
|
)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
# Include directories
|
||||||
|
include_directories(../common) # Required due to card_ref.h
|
||||||
|
|
||||||
# Build servatrice binary and link it
|
# Build servatrice binary and link it
|
||||||
add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_MOC_SRCS} ${dbconverter_SOURCES})
|
add_executable(dbconverter MACOSX_BUNDLE ${dbconverter_MOC_SRCS} ${dbconverter_SOURCES})
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,6 +79,7 @@ elseif(Qt5_FOUND)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
include_directories(../cockatrice/src)
|
include_directories(../cockatrice/src)
|
||||||
|
include_directories(../common)
|
||||||
|
|
||||||
# Libz is required to support zipped files
|
# Libz is required to support zipped files
|
||||||
find_package(ZLIB)
|
find_package(ZLIB)
|
||||||
|
|
|
||||||
|
|
@ -49,8 +49,8 @@ if(NOT GTEST_FOUND)
|
||||||
add_dependencies(filter_string_test gtest)
|
add_dependencies(filter_string_test gtest)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_libraries(carddatabase_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
|
target_link_libraries(carddatabase_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
|
||||||
target_link_libraries(filter_string_test Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
|
target_link_libraries(filter_string_test cockatrice_common Threads::Threads ${GTEST_BOTH_LIBRARIES} ${TEST_QT_MODULES})
|
||||||
|
|
||||||
add_test(NAME carddatabase_test COMMAND carddatabase_test)
|
add_test(NAME carddatabase_test COMMAND carddatabase_test)
|
||||||
add_test(NAME filter_string_test COMMAND filter_string_test)
|
add_test(NAME filter_string_test COMMAND filter_string_test)
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue