فهرست منبع

BUG: Detect debian with existence of /etc/debian_version so things work in a chroot install. This is suggested in bug#4805.

Brad King 18 سال پیش
والد
کامیت
96232d4052
1فایلهای تغییر یافته به همراه3 افزوده شده و 13 حذف شده
  1. 3 13
      Modules/Platform/Linux.cmake

+ 3 - 13
Modules/Platform/Linux.cmake

@@ -34,27 +34,17 @@ IF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
   SET(CMAKE_INSTALL_SO_NO_EXE "${CMAKE_INSTALL_SO_NO_EXE}" CACHE INTERNAL
     "Install .so files without execute permission.")
 ELSE(DEFINED CMAKE_INSTALL_SO_NO_EXE)
-  # Detect the linux distribution.
-  SET(CMAKE_LINUX_DISTRO)
-  IF(EXISTS "/proc/version")
-    FILE(READ "/proc/version" CMAKE_LINUX_DISTRO)
-  ENDIF(EXISTS "/proc/version")
-
-  # List the distributions that require shared libraries to not have
-  # execute permission.
-  SET(CMAKE_INSTALL_SO_NO_EXE_DISTRO "(Debian|Ubuntu)")
-
   # Store the decision variable as an internal cache entry to avoid
   # 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("${CMAKE_LINUX_DISTRO}" MATCHES "${CMAKE_INSTALL_SO_NO_EXE_DISTRO}")
+  IF(EXISTS "/etc/debian_version")
     SET(CMAKE_INSTALL_SO_NO_EXE 1 CACHE INTERNAL
       "Install .so files without execute permission.")
-  ELSE("${CMAKE_LINUX_DISTRO}" MATCHES "${CMAKE_INSTALL_SO_NO_EXE_DISTRO}")
+  ELSE(EXISTS "/etc/debian_version")
     SET(CMAKE_INSTALL_SO_NO_EXE 0 CACHE INTERNAL
       "Install .so files without execute permission.")
-  ENDIF("${CMAKE_LINUX_DISTRO}" MATCHES "${CMAKE_INSTALL_SO_NO_EXE_DISTRO}")
+  ENDIF(EXISTS "/etc/debian_version")
 ENDIF(DEFINED CMAKE_INSTALL_SO_NO_EXE)
 
 INCLUDE(Platform/UnixPaths)