mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-21 06:23:53 +00:00
Code Issues Releases Wiki Activity

switch Static Deps and Tests from GCC to clang and set to -O0 to speed up builds

Browse source
This commit is contained in:
psi29a 2022-01-18 18:22:46 +00:00 committed by jvoisin
parent 9d0e427ec1
commit ca6262c033
3 changed files with 18 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.gitlab-ci.yml
View file

@ -125,8 +125,8 @@ Ubuntu_GCC_tests_Debug:
paths: [] paths: []
expire_in: 1 minute expire_in: 1 minute
Ubuntu_GCC_Static_Deps: Ubuntu_Static_Deps:
extends: Ubuntu_GCC extends: Ubuntu_Clang
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
changes: changes:
@ -136,24 +136,30 @@ Ubuntu_GCC_Static_Deps:
- ".gitlab-ci.yml" - ".gitlab-ci.yml"
allow_failure: true allow_failure: true
cache: cache:
key: Ubuntu_GCC_Static_Deps key: Ubuntu_Static_Deps.V1
paths: paths:
- apt-cache/ - apt-cache/
- ccache/ - ccache/
- build/extern/fetched/ - build/extern/fetched/
before_script: before_script:
- CI/install_debian_deps.sh gcc openmw-deps openmw-deps-static - CI/install_debian_deps.sh clang openmw-deps openmw-deps-static
variables: variables:
CI_OPENMW_USE_STATIC_DEPS: 1 CI_OPENMW_USE_STATIC_DEPS: 1
CC: clang
CXX: clang++
CXXFLAGS: -O0
timeout: 3h timeout: 3h
Ubuntu_GCC_Static_Deps_tests: Ubuntu_Static_Deps_tests:
extends: Ubuntu_GCC_Static_Deps extends: Ubuntu_Static_Deps
cache: cache:
key: Ubuntu_GCC_Static_Deps_tests key: Ubuntu_Static_Deps_tests.V1
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
CC: clang
CXX: clang++
CXXFLAGS: -O0
artifacts: artifacts:
paths: [] paths: []
expire_in: 1 minute expire_in: 1 minute

4
CI/before_script.linux.sh
View file

@ -17,7 +17,7 @@ fi
CXX_FLAGS='-Werror -Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy' CXX_FLAGS='-Werror -Wno-error=deprecated-declarations -Wno-error=nonnull -Wno-error=deprecated-copy'
if [[ "${CXX}" == 'clang++' ]]; then if [[ "${CXX}" == 'clang++' ]]; then
CXX_FLAGS="${CXX_FLAGS} -Wno-error=unused-lambda-capture -Wno-error=gnu-zero-variadic-macro-arguments" CXX_FLAGS="${CXX_FLAGS} -Wno-error=unused-lambda-capture -Wno-error=gnu-zero-variadic-macro-arguments -Wno-error=misleading-indentation"
fi fi
declare -a CMAKE_CONF_OPTS=( declare -a CMAKE_CONF_OPTS=(
@ -30,7 +30,7 @@ declare -a CMAKE_CONF_OPTS=(
-DBUILD_SHARED_LIBS=OFF -DBUILD_SHARED_LIBS=OFF
-DUSE_SYSTEM_TINYXML=ON -DUSE_SYSTEM_TINYXML=ON
-DCMAKE_INSTALL_PREFIX=install -DCMAKE_INSTALL_PREFIX=install
-DCMAKE_C_FLAGS='-Werror' -DCMAKE_C_FLAGS="-Werror -Wno-error=misleading-indentation"
-DCMAKE_CXX_FLAGS="${CXX_FLAGS}" -DCMAKE_CXX_FLAGS="${CXX_FLAGS}"
-DOPENMW_CXX_FLAGS="-Werror=implicit-fallthrough" -DOPENMW_CXX_FLAGS="-Werror=implicit-fallthrough"
) )

6
extern/CMakeLists.txt vendored
View file

@ -147,11 +147,11 @@ if(NOT OPENMW_USE_SYSTEM_OSG)
endif() endif()
endif() endif()
# branch OpenSceneGraph-3.6 on 23 Jan 2021. # OSGoS branch 3.6
include(FetchContent) include(FetchContent)
FetchContent_Declare(osg FetchContent_Declare(osg
URL https://github.com/OpenMW/osg/archive/e65f47c4ab3a0b53cc19f517961671e5f840a08d.zip URL https://github.com/OpenMW/osg/archive/01cc2b585c8456a4ff843066b7e1a8715558289f.zip
URL_HASH MD5=0c967fe48d80744f6956f6b0b67ef7c6 URL_HASH MD5=f1496c5ce32f733581e84568cf2712af
SOURCE_DIR fetched/osg SOURCE_DIR fetched/osg
) )
FetchContent_MakeAvailableExcludeFromAll(osg) FetchContent_MakeAvailableExcludeFromAll(osg)