[cmake-commits] alex committed Windows-cl.cmake 1.79 1.80 Windows.cmake 1.6 1.7 WindowsPaths.cmake 1.3 1.4

[cmake-commits at cmake.org]

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

Modified Files:
	Windows-cl.cmake Windows.cmake WindowsPaths.cmake 
Log Message:

ENH: use WindowsPaths.cmake on all Windows platforms, not only for cl, makes
the mingw cross compiler work out of the box and should help mingw users on
windows with a common install dir

Alex


Index: Windows.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows.cmake,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Windows.cmake	18 Feb 2006 20:37:22 -0000	1.6
+++ Windows.cmake	2 Aug 2007 15:17:32 -0000	1.7
@@ -25,10 +25,10 @@
   SET(CMAKE_END_TEMP_FILE "\n<<")
 ENDIF(CMAKE_GENERATOR MATCHES "NMake")
 
+INCLUDE(Platform/WindowsPaths)
+
 # uncomment these out to debug nmake and borland makefiles
 #SET(CMAKE_START_TEMP_FILE "")
 #SET(CMAKE_END_TEMP_FILE "")
 #SET(CMAKE_VERBOSE_MAKEFILE 1)
 
-  
-

Index: WindowsPaths.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/WindowsPaths.cmake,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- WindowsPaths.cmake	27 Jul 2007 15:57:17 -0000	1.3
+++ WindowsPaths.cmake	2 Aug 2007 15:17:32 -0000	1.4
@@ -1,11 +1,17 @@
 GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${CMAKE_ROOT}" PATH)
 GET_FILENAME_COMPONENT(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
 
+# the /bin, /lib and /include dirs are mainly for mingw cross compiler users 
+# under Linux who use CMAKE_FIND_ROOT_PATH
 SET(CMAKE_SYSTEM_INCLUDE_PATH ${CMAKE_SYSTEM_INCLUDE_PATH}  
-    "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/include" "${_CMAKE_INSTALL_DIR}/include")
+    "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/include" "${_CMAKE_INSTALL_DIR}/include" /include)
 
+# mingw can also link against dlls which can also be in /bin, so list this too
 SET(CMAKE_SYSTEM_LIBRARY_PATH ${CMAKE_SYSTEM_LIBRARY_PATH} 
-   "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/lib" "${CMAKE_INSTALL_PREFIX}/bin" "${_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"
+   /lib /bin )
 
 SET(CMAKE_SYSTEM_PROGRAM_PATH ${CMAKE_SYSTEM_PROGRAM_PATH} 
-   "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/bin" "${_CMAKE_INSTALL_DIR}/bin")
+   "$ENV{ProgramFiles}" "${CMAKE_INSTALL_PREFIX}/bin" "${_CMAKE_INSTALL_DIR}/bin" /bin)

Index: Windows-cl.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/Platform/Windows-cl.cmake,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- Windows-cl.cmake	17 May 2007 17:20:43 -0000	1.79
+++ Windows-cl.cmake	2 Aug 2007 15:17:32 -0000	1.80
@@ -271,4 +271,3 @@
                ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeCXXPlatform.cmake IMMEDIATE)
 ENDIF(NOT EXISTS "${CMAKE_PLATFORM_ROOT_BIN}/CMakeCXXPlatform.cmake")
 
-INCLUDE(Platform/WindowsPaths)