mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-06 13:33:55 -07:00
Merge remote-tracking branch 'upstream/master' into cmake_qt5
This commit is contained in:
commit
5c13c06982
34 changed files with 1505 additions and 1221 deletions
|
|
@ -109,9 +109,3 @@ option(WITH_ORACLE "build oracle" ON)
|
|||
if(WITH_ORACLE)
|
||||
add_subdirectory(oracle)
|
||||
endif()
|
||||
|
||||
# Compile testclient (default off)
|
||||
option(WITH_TESTCLIENT "build testclient" OFF)
|
||||
if (WITH_TESTCLIENT)
|
||||
add_subdirectory(testclient)
|
||||
endif()
|
||||
Loading…
Add table
Add a link
Reference in a new issue