[Cmake-commits] [cmake-commits] alex committed CMakeVS8FindMake.cmake 1.7 1.8 CMakeVS9FindMake.cmake 1.1 1.2

[cmake-commits at cmake.org]

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

Modified Files:
	CMakeVS8FindMake.cmake CMakeVS9FindMake.cmake 
Log Message:
ENH: when cross compiling, e.g. for WinCE, don't use VCExpress, since this doesn't support it
This is the first patch to add support for WinCE to cmake (#7919)

Alex


Index: CMakeVS8FindMake.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeVS8FindMake.cmake,v
retrieving revision 1.7
retrieving revision 1.8
diff -C 2 -d -r1.7 -r1.8
*** CMakeVS8FindMake.cmake	17 Sep 2007 19:20:52 -0000	1.7
--- CMakeVS8FindMake.cmake	9 May 2009 12:15:51 -0000	1.8
***************
*** 1,4 ****
  FIND_PROGRAM(CMAKE_MAKE_PROGRAM
!   NAMES VCExpress devenv 
    PATHS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory]
--- 1,11 ----
+ 
+ # VCExpress does not support cross compiling, which is necessary for Win CE
+ SET( _CMAKE_MAKE_PROGRAM_NAMES devenv)
+ IF(NOT CMAKE_CROSSCOMPILING)
+   SET( _CMAKE_MAKE_PROGRAM_NAMES ${_CMAKE_MAKE_PROGRAM_NAMES} VCExpress)
+ ENDIF(NOT CMAKE_CROSSCOMPILING)
+ 
  FIND_PROGRAM(CMAKE_MAKE_PROGRAM
!   NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
    PATHS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory]

Index: CMakeVS9FindMake.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/CMakeVS9FindMake.cmake,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** CMakeVS9FindMake.cmake	17 Sep 2007 19:21:47 -0000	1.1
--- CMakeVS9FindMake.cmake	9 May 2009 12:15:53 -0000	1.2
***************
*** 1,4 ****
  FIND_PROGRAM(CMAKE_MAKE_PROGRAM
!   NAMES VCExpress devenv 
    PATHS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VS;EnvironmentDirectory]
--- 1,11 ----
+ 
+ # VCExpress does not support cross compiling, which is necessary for Win CE
+ SET( _CMAKE_MAKE_PROGRAM_NAMES devenv)
+ IF(NOT CMAKE_CROSSCOMPILING)
+   SET( _CMAKE_MAKE_PROGRAM_NAMES ${_CMAKE_MAKE_PROGRAM_NAMES} VCExpress)
+ ENDIF(NOT CMAKE_CROSSCOMPILING)
+ 
  FIND_PROGRAM(CMAKE_MAKE_PROGRAM
!   NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
    PATHS
    [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VS;EnvironmentDirectory]