[cmake-commits] king committed Linux.cmake 1.13 1.14

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules/Platform
In directory public:/mounts/ram/cvs-serv23190

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


Index: Linux.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Linux.cmake,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- Linux.cmake	18 Apr 2007 03:40:51 -0000	1.13
+++ Linux.cmake	7 May 2007 22:17:32 -0000	1.14
@@ -34,27 +34,17 @@
   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)