Signed-off-by: Zhang Zongyu diff -Nur a/Modules/CMakeFindPackageMode.cmake b/Modules/CMakeFindPackageMode.cmake --- a/Modules/CMakeFindPackageMode.cmake 2020-07-22 15:12:51.077767053 +0800 +++ b/Modules/CMakeFindPackageMode.cmake 2020-07-22 15:13:26.737765370 +0800 @@ -93,22 +93,6 @@ endif() endif() - # guess Debian multiarch if it has not been set: - if(EXISTS /etc/debian_version) - if(NOT CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ) - file(GLOB filesInLib RELATIVE /lib /lib/*-linux-gnu* ) - foreach(file ${filesInLib}) - if("${file}" MATCHES "${CMAKE_LIBRARY_ARCHITECTURE_REGEX}") - set(CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE ${file}) - break() - endif() - endforeach() - endif() - if(NOT CMAKE_LIBRARY_ARCHITECTURE) - set(CMAKE_LIBRARY_ARCHITECTURE ${CMAKE_${LANGUAGE}_LIBRARY_ARCHITECTURE}) - endif() - endif() - endif() set(CMAKE_${LANGUAGE}_COMPILER "dummy") diff -Nur a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake --- a/Modules/FindPkgConfig.cmake 2020-07-22 15:12:51.083767053 +0800 +++ b/Modules/FindPkgConfig.cmake 2020-07-22 15:13:21.237765630 +0800 @@ -299,24 +299,18 @@ if(NOT DEFINED CMAKE_SYSTEM_NAME OR (CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" AND NOT CMAKE_CROSSCOMPILING)) - if(EXISTS "/etc/debian_version") # is this a debian system ? - if(CMAKE_LIBRARY_ARCHITECTURE) - list(APPEND _lib_dirs "lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig") - endif() - else() - # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties - get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS) - if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4) - list(APPEND _lib_dirs "lib32/pkgconfig") - endif() - get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) - if(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8) - list(APPEND _lib_dirs "lib64/pkgconfig") - endif() - get_property(uselibx32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS) - if(uselibx32 AND CMAKE_INTERNAL_PLATFORM_ABI STREQUAL "ELF X32") - list(APPEND _lib_dirs "libx32/pkgconfig") - endif() + # not debian, check the FIND_LIBRARY_USE_LIB32_PATHS and FIND_LIBRARY_USE_LIB64_PATHS properties + get_property(uselib32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS) + if(uselib32 AND CMAKE_SIZEOF_VOID_P EQUAL 4) + list(APPEND _lib_dirs "lib32/pkgconfig") + endif() + get_property(uselib64 GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS) + if(uselib64 AND CMAKE_SIZEOF_VOID_P EQUAL 8) + list(APPEND _lib_dirs "lib64/pkgconfig") + endif() + get_property(uselibx32 GLOBAL PROPERTY FIND_LIBRARY_USE_LIBX32_PATHS) + if(uselibx32 AND CMAKE_INTERNAL_PLATFORM_ABI STREQUAL "ELF X32") + list(APPEND _lib_dirs "libx32/pkgconfig") endif() endif() if(CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" AND NOT CMAKE_CROSSCOMPILING) diff -Nur a/Modules/GNUInstallDirs.cmake b/Modules/GNUInstallDirs.cmake --- a/Modules/GNUInstallDirs.cmake 2020-07-22 15:12:51.085767053 +0800 +++ b/Modules/GNUInstallDirs.cmake 2020-07-22 15:13:15.987765878 +0800 @@ -227,24 +227,11 @@ "Please enable at least one language before including GNUInstallDirs.") endif() if(CMAKE_SYSTEM_NAME MATCHES "^(Linux|kFreeBSD|GNU)$" - AND NOT CMAKE_CROSSCOMPILING - AND NOT EXISTS "/etc/arch-release") - if (EXISTS "/etc/debian_version") # is this a debian system ? - if(CMAKE_LIBRARY_ARCHITECTURE) - if("${CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") - set(_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") - endif() - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX - AND "${_GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX}" MATCHES "^/usr/?$") - set(__LAST_LIBDIR_DEFAULT "lib/${CMAKE_LIBRARY_ARCHITECTURE}") - endif() - endif() - else() # not debian, rely on CMAKE_SIZEOF_VOID_P: - if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") - set(_LIBDIR_DEFAULT "lib64") - if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) - set(__LAST_LIBDIR_DEFAULT "lib64") - endif() + AND NOT CMAKE_CROSSCOMPILING) + if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8") + set(_LIBDIR_DEFAULT "lib64") + if(DEFINED _GNUInstallDirs_LAST_CMAKE_INSTALL_PREFIX) + set(__LAST_LIBDIR_DEFAULT "lib64") endif() endif() endif() diff -Nur a/Modules/Platform/GNU.cmake b/Modules/Platform/GNU.cmake --- a/Modules/Platform/GNU.cmake 2020-07-22 15:12:51.088767053 +0800 +++ b/Modules/Platform/GNU.cmake 2020-07-22 15:13:10.644766130 +0800 @@ -26,13 +26,8 @@ # checking the platform every time. This option is advanced enough # that only package maintainers should need to adjust it. They are # capable of providing a setting on the command line. - if(EXISTS "/etc/debian_version") - set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL - "Install .so files without execute permission.") - else() - set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL - "Install .so files without execute permission.") - endif() + set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL + "Install .so files without execute permission.") endif() set(CMAKE_LIBRARY_ARCHITECTURE_REGEX "[a-z0-9_]+(-[a-z0-9_]+)?-gnu[a-z0-9_]*") diff -Nur a/Modules/Platform/Linux.cmake b/Modules/Platform/Linux.cmake --- a/Modules/Platform/Linux.cmake 2020-07-22 15:12:51.088767053 +0800 +++ b/Modules/Platform/Linux.cmake 2020-07-22 15:13:10.644766130 +0800 @@ -37,13 +37,8 @@ # checking the platform every time. This option is advanced enough # that only package maintainers should need to adjust it. They are # capable of providing a setting on the command line. - if(EXISTS "/etc/debian_version") - set(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL - "Install .so files without execute permission.") - else() - set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL - "Install .so files without execute permission.") - endif() + set(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL + "Install .so files without execute permission.") endif() # Match multiarch library directory names. @@ -51,9 +46,3 @@ include(Platform/UnixPaths) -# Debian has lib32 and lib64 paths only for compatibility so they should not be -# searched. -if(NOT CMAKE_CROSSCOMPILING AND EXISTS "/etc/debian_version") - set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB32_PATHS FALSE) - set_property(GLOBAL PROPERTY FIND_LIBRARY_USE_LIB64_PATHS FALSE) -endif()