[cmake-commits] alex committed UnixPaths.cmake 1.9 1.10 WindowsPaths.cmake 1.2 1.3

[cmake-commits at cmake.org]

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

Modified Files:
	UnixPaths.cmake WindowsPaths.cmake 
Log Message:

ENH: 
-add /usr/openwin/include and /usr/openwin/lib to the default search paths
-add /${CMAKE_INSTALL_PREFIX}/(lib|bin|include) to the default cmake search
paths -> this should help users who install stuff in their home

Alex



Index: WindowsPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/WindowsPaths.cmake,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- WindowsPaths.cmake	17 Jul 2007 12:51:45 -0000	1.2
+++ WindowsPaths.cmake	27 Jul 2007 15:57:17 -0000	1.3
@@ -2,10 +2,10 @@
 GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
 
 SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH}  
-    "$ENV{ProgramFiles}" "${_CMAKE_INSTALL_DIR}/include")
+    "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/include" "${_CMAKE_INSTALL_DIR}/include")
 
 SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
-   "$ENV{ProgramFiles}" "${_CMAKE_INSTALL_DIR}/lib" "${_CMAKE_INSTALL_DIR}/bin")
+   "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/lib" "${CMAKE_INSTALL_PREFIX}/bin" "${_CMAKE_INSTALL_DIR}/lib" "${_CMAKE_INSTALL_DIR}/bin")
 
 SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} 
-   "$ENV{ProgramFiles}" "${_CMAKE_INSTALL_DIR}/bin")
+   "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/bin" "${_CMAKE_INSTALL_DIR}/bin")

Index: UnixPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/UnixPaths.cmake,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- UnixPaths.cmake	16 Jul 2007 13:08:45 -0000	1.9
+++ UnixPaths.cmake	27 Jul 2007 15:57:17 -0000	1.10
@@ -15,8 +15,10 @@
 
   # Other
   /opt/local/include /usr/pkg/include
-  /opt/csw/include /opt/include
+  /opt/csw/include /opt/include  
+  /usr/openwin/include
   "${_CMAKE_INSTALL_DIR}/include"
+  "${CMAKE_INSTALL_PREFIX}/include"
   )
 
 SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH}
@@ -31,13 +33,16 @@
 
   # Other
   /opt/local/lib /usr/pkg/lib
-  /opt/csw/lib /opt/lib
+  /opt/csw/lib /opt/lib 
+  /usr/openwin/lib
   "${_CMAKE_INSTALL_DIR}/lib"
+  "${CMAKE_INSTALL_PREFIX}/lib"
   )
 
 SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH}
   /bin /usr/bin /usr/local/bin /usr/pkg/bin /sbin
   "${_CMAKE_INSTALL_DIR}/bin"
+  "${CMAKE_INSTALL_PREFIX}/bin"
   )
 
 SET(CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES