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

cleanup

Browse source
This commit is contained in:
tooomm 2025-05-29 17:24:28 +02:00
parent 1801472475
commit 785d84d303
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.ci/compile.sh
View file

@ -139,7 +139,7 @@ if [[ $USE_CCACHE ]]; then
echo "::endgroup::" echo "::endgroup::"
fi fi
echo "::group::Configure cmake" echo "::group::Configure CMake"
cmake --version cmake --version
cmake .. "${flags[@]}" cmake .. "${flags[@]}"
echo "::endgroup::" echo "::endgroup::"

12
oracle/CMakeLists.txt
View file

@ -51,11 +51,11 @@ if(UPDATE_TRANSLATIONS)
set(oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/oracle_en@source.ts") set(oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/oracle_en@source.ts")
else() else()
file(GLOB oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts") file(GLOB oracle_TS "${CMAKE_CURRENT_SOURCE_DIR}/translations/*.ts")
endif(UPDATE_TRANSLATIONS) endif()
if(WIN32) if(WIN32)
set(oracle_SOURCES ${oracle_SOURCES} oracle.rc) set(oracle_SOURCES ${oracle_SOURCES} oracle.rc)
endif(WIN32) endif()
if(APPLE) if(APPLE)
set(MACOSX_BUNDLE_ICON_FILE appicon.icns) set(MACOSX_BUNDLE_ICON_FILE appicon.icns)
@ -63,7 +63,7 @@ if(APPLE)
${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns PROPERTIES MACOSX_PACKAGE_LOCATION Resources
) )
set(oracle_SOURCES ${oracle_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns) set(oracle_SOURCES ${oracle_SOURCES} ${CMAKE_CURRENT_SOURCE_DIR}/resources/appicon.icns)
endif(APPLE) endif()
if(Qt6_FOUND) if(Qt6_FOUND)
qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES}) qt6_add_resources(oracle_RESOURCES_RCC ${oracle_RESOURCES})
@ -73,12 +73,11 @@ endif()
include_directories(../cockatrice/src) include_directories(../cockatrice/src)
# Libz is required to support zipped files # Libz is required to support zip files
find_package(ZLIB) find_package(ZLIB)
if(ZLIB_FOUND) if(ZLIB_FOUND)
include_directories(${ZLIB_INCLUDE_DIRS}) include_directories(${ZLIB_INCLUDE_DIRS})
add_definitions("-DHAS_ZLIB") add_definitions("-DHAS_ZLIB")
set(oracle_SOURCES ${oracle_SOURCES} src/zip/unzip.cpp src/zip/zipglobal.cpp) set(oracle_SOURCES ${oracle_SOURCES} src/zip/unzip.cpp src/zip/zipglobal.cpp)
else() else()
message(STATUS "Oracle: zlib not found; ZIP support disabled") message(STATUS "Oracle: zlib not found; ZIP support disabled")
@ -89,7 +88,6 @@ find_package(LibLZMA)
if(LIBLZMA_FOUND) if(LIBLZMA_FOUND)
include_directories(${LIBLZMA_INCLUDE_DIRS}) include_directories(${LIBLZMA_INCLUDE_DIRS})
add_definitions("-DHAS_LZMA") add_definitions("-DHAS_LZMA")
set(oracle_SOURCES ${oracle_SOURCES} src/lzma/decompress.cpp) set(oracle_SOURCES ${oracle_SOURCES} src/lzma/decompress.cpp)
else() else()
message(STATUS "Oracle: LibLZMA not found; xz support disabled") message(STATUS "Oracle: LibLZMA not found; xz support disabled")
@ -164,7 +162,7 @@ endif()
if(NOT WIN32 AND NOT APPLE) if(NOT WIN32 AND NOT APPLE)
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR}) install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/oracle.desktop DESTINATION ${DESKTOPDIR})
endif(NOT WIN32 AND NOT APPLE) endif()
if(APPLE) if(APPLE)
# these needs to be relative to CMAKE_INSTALL_PREFIX # these needs to be relative to CMAKE_INSTALL_PREFIX