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

Use clang

Browse source
This commit is contained in:
Bruno Alexandre Rosa 2025-05-13 15:35:59 -03:00
parent 49d2adc2e7
commit df1747bb90
2 changed files with 6 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.ci/compile.sh
View file

@ -169,7 +169,8 @@ if [[ $MAKE_PACKAGE ]]; then
echo "killing XProtectBehaviorService"; sudo pkill -9 XProtect >/dev/null || true; echo "killing XProtectBehaviorService"; sudo pkill -9 XProtect >/dev/null || true;
echo "waiting for XProtectBehaviorService kill"; while pgrep "XProtect"; do sleep 3; done; echo "waiting for XProtectBehaviorService kill"; while pgrep "XProtect"; do sleep 3; done;
fi fi
cmake --build . --target package --config "$BUILDTYPE"
cmake --build . --log-level=VERBOSE --target package --config "$BUILDTYPE"
echo "::endgroup::" echo "::endgroup::"
if [[ $PACKAGE_SUFFIX ]]; then if [[ $PACKAGE_SUFFIX ]]; then

5
CMakeLists.txt
View file

@ -25,6 +25,8 @@ option(WITH_DBCONVERTER "build dbconverter" ON)
# Compile tests # Compile tests
option(TEST "build tests" OFF) option(TEST "build tests" OFF)
set(CPACK_VERBOSE TRUE)
# Default to "Release" build type # Default to "Release" build type
# User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call # User-provided value for CMAKE_BUILD_TYPE must be checked before the PROJECT() call
if(DEFINED CMAKE_BUILD_TYPE) if(DEFINED CMAKE_BUILD_TYPE)
@ -87,6 +89,7 @@ set(CMAKE_CXX_STANDARD
CACHE STRING "C++ ISO Standard" CACHE STRING "C++ ISO Standard"
) )
set(CMAKE_CXX_STANDARD_REQUIRED True) set(CMAKE_CXX_STANDARD_REQUIRED True)
set(CMAKE_CXX_EXTENSIONS OFF)
# Set conventional loops # Set conventional loops
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true)
@ -135,7 +138,7 @@ if(UNIX)
endif() endif()
endif() endif()
elseif(WIN32) elseif(WIN32)
set(CMAKE_INSTALL_PREFIX ${CMAKE_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE}) set(CMAKE_INSTALL_PREFIX ${PROJECT_BINARY_DIR}/rundir/${CMAKE_BUILD_TYPE})
endif() endif()
# Define proper compilation flags # Define proper compilation flags