[cmake-commits] alex committed CMakeGenericSystem.cmake 1.16 1.17

cmake-commits at cmake.org cmake-commits at cmake.org
Thu Aug 9 16:47:37 EDT 2007


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

Modified Files:
	CMakeGenericSystem.cmake 
Log Message:

BUG: use CMAKE_HOST_UNIX here instead of UNIX

Alex


Index: CMakeGenericSystem.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeGenericSystem.cmake,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- CMakeGenericSystem.cmake	26 Jun 2007 17:05:27 -0000	1.16
+++ CMakeGenericSystem.cmake	9 Aug 2007 20:47:35 -0000	1.17
@@ -47,10 +47,10 @@
 ENDIF(NOT DEFINED CMAKE_INSTALL_PREFIX)
 
 # Choose a default install prefix for this platform.
-IF(UNIX)
+IF(CMAKE_HOST_UNIX)
   SET(CMAKE_INSTALL_PREFIX "/usr/local"
     CACHE PATH "Install path prefix, prepended onto install directories.")
-ELSE(UNIX)
+ELSE(CMAKE_HOST_UNIX)
   IF("$ENV{ProgramFiles}" MATCHES "^$")
     IF("$ENV{SystemDrive}" MATCHES "^$")
       SET(CMAKE_GENERIC_PROGRAM_FILES "C:/Program Files")
@@ -68,7 +68,7 @@
   # Make sure the prefix uses forward slashes.
   STRING(REGEX REPLACE "\\\\" "/"
     CMAKE_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}")
-ENDIF(UNIX)
+ENDIF(CMAKE_HOST_UNIX)
 
 MARK_AS_ADVANCED(
   CMAKE_SKIP_RPATH



More information about the Cmake-commits mailing list