From 993324f1303be8173fa7fd3b247539554dd18f41 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 2 Dec 2023 10:36:54 +0100 Subject: [PATCH] disables TCC in CI --- CMakeLists.txt | 5 ++++- Jenkinsfile | 9 ++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 6861e16..229ec83 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -80,7 +80,10 @@ set(CONAN_PACKAGE_LIST ) set(CONAN_PACKAGE_OPTIONS fmt:header_only=True ${CONAN_BOOST_OPTIONS}) if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND WITH_TCC) - list(APPEND CONAN_PACKAGE_LIST seasocks/1.4.4 tcc/0.9.27) + list(APPEND CONAN_PACKAGE_LIST seasocks/1.4.4) + if(WITH_TCC) + list(APPEND CONAN_PACKAGE_LIST tcc/0.9.27) + endif() list(APPEND CONAN_PACKAGE_OPTIONS lua:compile_as_cpp=False ) endif() if(WITH_LLVM) diff --git a/Jenkinsfile b/Jenkinsfile index 0ac83e2..7bd630d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -39,11 +39,10 @@ void build_tgc_vp() { catch (exc) { echo 'Conan configured' } - sh("rm -rf TGC-VP/build") - sh("mkdir -p TGC-VP/build") - sh("cd TGC-VP && git submodule update --recursive") - sh("cmake -S . -B build && cmake --build build -j16") - fingerprint 'TGC-VP/build/src/tgc-vp' + sh("rm -rf build") + sh("git submodule update --recursive") + sh("cmake -S . -B build -DWITH_TCC=OFF && cmake --build build -j16") + fingerprint 'build/src/tgc-vp' } pipeline {