all: and yet more cleanups; NFCI

This commit is contained in:
Markus F.X.J. Oberhumer
2024-03-25 11:07:40 +01:00
parent 7e839e6962
commit a27a9e6000
16 changed files with 72 additions and 48 deletions
+1 -1
View File
@@ -1,4 +1,4 @@
# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
---
Checks: >
-*,
+1 -1
View File
@@ -1,4 +1,4 @@
# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
---
Checks: >
-*,
+1 -1
View File
@@ -1,4 +1,4 @@
# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
---
Checks: >
-*,
+1 -1
View File
@@ -1,4 +1,4 @@
# for clang-tidy-16 from https://clang.llvm.org/extra/clang-tidy/
# for clang-tidy from https://clang.llvm.org/extra/clang-tidy/
---
Checks: >
-*,
+10
View File
@@ -72,6 +72,16 @@ function(upx_print_var) # ARGV
endforeach()
endfunction()
function(upx_print_env_var) # ARGV
foreach(var_name ${ARGV})
if(DEFINED ENV{${var_name}})
if(NOT ",$ENV{${var_name}}," STREQUAL ",,")
message(STATUS "ENV{${var_name}} = $ENV{${var_name}}")
endif()
endif()
endforeach()
endfunction()
function(upx_print_have_symbol) # ARGV; needs include(CheckSymbolExists)
foreach(symbol ${ARGV})
set(cache_var_name "HAVE_symbol_${symbol}")
+7 -2
View File
@@ -260,6 +260,9 @@ build/$(UPX_XTARGET)/%: export CXX := $(CXX)
xtarget/all: xtarget/debug xtarget/release PHONY
xtarget/debug: build/$(UPX_XTARGET)/debug PHONY
xtarget/release: build/$(UPX_XTARGET)/release PHONY
xtarget/all+test: xtarget/debug+test xtarget/release+test PHONY
xtarget/debug+test: build/$(UPX_XTARGET)/debug+test PHONY
xtarget/release+test: build/$(UPX_XTARGET)/release+test PHONY
# set new default
.DEFAULT_GOAL := build/$(UPX_XTARGET)/release
@@ -269,14 +272,16 @@ endif
#***********************************************************************
# assemble cmake config flags; useful for CI jobs
#
# info: by default CMake only honors the CC and CXX environment variables; make
# it easy to set other variables like CMAKE_AR or CMAKE_RANLIB
#***********************************************************************
ifneq ($(origin UPX_CMAKE_CONFIG_FLAGS),command line) # GNU make bug work-around
# GNU make bug, see https://savannah.gnu.org/bugs/index.php?64822
# and commit https://git.savannah.gnu.org/cgit/make.git/commit/?id=07187db947ba25e6c59b55f10660a04f8e9c5229
# info: by default CMake only honors the CC and CXX environment variables; make
# it easy to set other variables like CMAKE_AR or CMAKE_RANLIB
$(call check_undefined,__add_cmake_config)
__add_cmake_config = $(and $($1),-D$1="$($1)")
# pass common CMake settings from environment/make to cmake
build/%: UPX_CMAKE_CONFIG_FLAGS += $(call __add_cmake_config,CMAKE_VERBOSE_MAKEFILE)