warning as error default to OFF and enabled in CI (#3814)

This commit is contained in:
Johan Mabille 2025-02-11 15:05:41 +01:00 committed by GitHub
parent de820f6d8c
commit 89abba3df0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 12 additions and 8 deletions

View File

@ -40,6 +40,7 @@ jobs:
--preset mamba-unix-shared-${{ inputs.build_type }} \ --preset mamba-unix-shared-${{ inputs.build_type }} \
-D CMAKE_CXX_COMPILER_LAUNCHER=sccache \ -D CMAKE_CXX_COMPILER_LAUNCHER=sccache \
-D CMAKE_C_COMPILER_LAUNCHER=sccache \ -D CMAKE_C_COMPILER_LAUNCHER=sccache \
-D MAMBA_WARNING_AS_ERROR=ON \
-D BUILD_LIBMAMBAPY=OFF \ -D BUILD_LIBMAMBAPY=OFF \
-D ENABLE_MAMBA_ROOT_PREFIX_FALLBACK=OFF -D ENABLE_MAMBA_ROOT_PREFIX_FALLBACK=OFF
cmake --build build/ --parallel cmake --build build/ --parallel

View File

@ -19,11 +19,8 @@ option(BUILD_LIBMAMBA_TESTS "Build libmamba C++ tests" OFF)
option(BUILD_MAMBA "Build mamba" OFF) option(BUILD_MAMBA "Build mamba" OFF)
option(BUILD_MICROMAMBA "Build micromamba" OFF) option(BUILD_MICROMAMBA "Build micromamba" OFF)
option(BUILD_MAMBA_PACKAGE "Build mamba package utility" OFF) option(BUILD_MAMBA_PACKAGE "Build mamba package utility" OFF)
if(MSVC)
option(MAMBA_WARNING_AS_ERROR "Treat compiler warnings as errors" OFF) option(MAMBA_WARNING_AS_ERROR "Treat compiler warnings as errors" OFF)
else()
option(MAMBA_WARNING_AS_ERROR "Treat compiler warnings as errors" ON)
endif()
set( set(
MAMBA_LTO MAMBA_LTO
"Default" "Default"

View File

@ -1,6 +1,7 @@
import importlib.util import importlib.util
import os import os
import pathlib import pathlib
import sys
import skbuild import skbuild
import skbuild.constants import skbuild.constants
@ -23,6 +24,13 @@ def libmambapy_version():
return ver.__version__ return ver.__version__
def get_cmake_args():
cmake_args = [f"-DMAMBA_INSTALL_PYTHON_EXT_LIBDIR={CMAKE_INSTALL_DIR()}/src/libmambapy"]
if sys.platform != "win32" and sys.platform != "cygwin":
cmake_args += ["-DMAMBA_WARNING_AS_ERROR=ON"]
return cmake_args
skbuild.setup( skbuild.setup(
version=libmambapy_version(), version=libmambapy_version(),
packages=["libmambapy", "libmambapy.bindings", "libmambapy.solver"], packages=["libmambapy", "libmambapy.bindings", "libmambapy.solver"],
@ -31,7 +39,5 @@ skbuild.setup(
cmake_languages=["CXX"], cmake_languages=["CXX"],
cmake_minimum_required_version="3.17", cmake_minimum_required_version="3.17",
cmake_install_dir="src/libmambapy", # Must match package_dir layout cmake_install_dir="src/libmambapy", # Must match package_dir layout
cmake_args=[ cmake_args=get_cmake_args(),
f"-DMAMBA_INSTALL_PYTHON_EXT_LIBDIR={CMAKE_INSTALL_DIR()}/src/libmambapy",
],
) )