cmake update

misc/cmake/functions.cmake

@@ -171,6 +171,18 @@ function(upx_cache_bool_vars) # ARGV
     endforeach()
 endfunction()
 
+function(upx_platform_check_mismatch var_name_1 var_name_2)
+    if(DEFINED ${var_name_1} OR DEFINED ${var_name_2})
+        if(NOT ",${${var_name_1}}," STREQUAL ",${${var_name_2}},")
+            if(UPX_CONFIG_DISABLE_WERROR)
+                message(WARNING "WARNING: '${var_name_1}' '${var_name_2}' mismatch")
+            else()
+                message(FATAL_ERROR "FATAL ERROR: '${var_name_1}' '${var_name_2}' mismatch")
+            endif()
+        endif()
+    endif()
+endfunction()
+
 #***********************************************************************
 # compilation flags
 #***********************************************************************

misc/scripts/run_cmake_config.sh

@@ -4,36 +4,37 @@ set -e; set -o pipefail
 
 # Copyright (C) Markus Franz Xaver Johannes Oberhumer
 # assemble cmake config flags; useful for CI jobs
+# also see misc/make/Makefile-extra.mk
 
 cmake_config_flags=()
 
-add_flag() {
+__add_cmake_config() {
     [[ -z "${!1}" ]] || cmake_config_flags+=( -D$1="${!1}" )
 }
 
 # pass common CMake settings from environment to cmake
 for v in CMAKE_VERBOSE_MAKEFILE; do
-    add_flag $v
+    __add_cmake_config $v
 done
 # pass common CMake toolchain settings from environment to cmake
 for v in CMAKE_ADDR2LINE CMAKE_AR CMAKE_DLLTOOL CMAKE_LINKER CMAKE_NM CMAKE_OBJCOPY CMAKE_OBJDUMP CMAKE_RANLIB CMAKE_READELF CMAKE_STRIP CMAKE_TAPI; do
-    add_flag $v
+    __add_cmake_config $v
 done
 # pass common CMake LTO toolchain settings from environment to cmake (for use with "-flto")
 for v in CMAKE_C_COMPILER_AR CMAKE_C_COMPILER_RANLIB CMAKE_CXX_COMPILER_AR CMAKE_CXX_COMPILER_RANLIB; do
-    add_flag $v
+    __add_cmake_config $v
 done
 # pass common CMake cross compilation settings from environment to cmake
 for v in CMAKE_SYSTEM_NAME CMAKE_SYSTEM_PROCESSOR CMAKE_CROSSCOMPILING_EMULATOR; do
-    add_flag $v
+    __add_cmake_config $v
 done
 # pass UPX config options from environment to cmake; see CMakeLists.txt
 for v in UPX_CONFIG_DISABLE_GITREV UPX_CONFIG_DISABLE_SANITIZE UPX_CONFIG_DISABLE_WSTRICT UPX_CONFIG_DISABLE_WERROR UPX_CONFIG_DISABLE_SELF_PACK_TEST; do
-    add_flag $v
+    __add_cmake_config $v
 done
 # pass UPX extra compile options from environment to cmake; see CMakeLists.txt
 for v in UPX_CONFIG_EXTRA_COMPILE_OPTIONS_BZIP2 UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UCL UPX_CONFIG_EXTRA_COMPILE_OPTIONS_UPX UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZLIB UPX_CONFIG_EXTRA_COMPILE_OPTIONS_ZSTD; do
-    add_flag $v
+    __add_cmake_config $v
 done
 
 exec "${CMAKE:-cmake}" $UPX_CMAKE_CONFIG_FLAGS "${cmake_config_flags[@]}" "$@"