diff options
| author | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-11-11 16:30:50 +0000 |
|---|---|---|
| committer | Repository mirror & CI <repomirrorci@gentoo.org> | 2025-11-11 16:30:50 +0000 |
| commit | 47df4096235cbb9ac999f381286d06307473c13f (patch) | |
| tree | d6d33cdc124c3ddc72627df737629392efe335c2 | |
| parent | 316856bf11a99d797c48a3e5bc4ba87acd96000a (diff) | |
| parent | 39a29e24c123065dcdcc8abadc346e8fd9de09cd (diff) | |
| download | kde-47df4096235cbb9ac999f381286d06307473c13f.tar.gz kde-47df4096235cbb9ac999f381286d06307473c13f.tar.bz2 kde-47df4096235cbb9ac999f381286d06307473c13f.zip | |
Merge updates from master
| -rw-r--r-- | eclass/cmake.eclass | 33 |
1 files changed, 19 insertions, 14 deletions
diff --git a/eclass/cmake.eclass b/eclass/cmake.eclass index 98f10f8d9aa..069a332bd9a 100644 --- a/eclass/cmake.eclass +++ b/eclass/cmake.eclass @@ -165,6 +165,13 @@ _CMAKE_MINREQVER_CMAKE316=() # @DESCRIPTION: # Array of tests that should be skipped when running CTest. +case ${CMAKE_BUILD_TYPE} in + Gentoo) + ewarn "\${CMAKE_BUILD_TYPE} \"Gentoo\" is a no-op. Default is RelWithDebInfo." + ;; + *) ;; +esac + case ${CMAKE_ECM_MODE} in auto|true|false) ;; *) @@ -676,20 +683,18 @@ cmake_src_configure() { fi # Wipe the default optimization flags out of CMake - if [[ ${CMAKE_BUILD_TYPE} != Gentoo ]]; then - cat >> ${common_config} <<- _EOF_ || die - set(CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") - set(CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") - set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") - set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") - set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") - set(CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") - set(CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") - set(CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") - set(CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") - set(CMAKE_INSTALL_ALWAYS 1) # see Gentoo-bug 735820 - _EOF_ - fi + cat >> ${common_config} <<- _EOF_ || die + set(CMAKE_ASM_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + set(CMAKE_ASM-ATT_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + set(CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + set(CMAKE_CXX_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + set(CMAKE_Fortran_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + set(CMAKE_EXE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + set(CMAKE_MODULE_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + set(CMAKE_SHARED_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + set(CMAKE_STATIC_LINKER_FLAGS_${CMAKE_BUILD_TYPE^^} "" CACHE STRING "") + set(CMAKE_INSTALL_ALWAYS 1) # see Gentoo-bug 735820 + _EOF_ # Make the array a local variable since <=portage-2.1.6.x does not support # global arrays (see bug #297255). But first make sure it is initialised. |