Przeglądaj źródła

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

Alexander Neundorf 16 lat temu
rodzic
commit
e0e93a3912
2 zmienionych plików z 16 dodań i 2 usunięć
  1. 8 1
      Modules/CMakeVS8FindMake.cmake
  2. 8 1
      Modules/CMakeVS9FindMake.cmake

+ 8 - 1
Modules/CMakeVS8FindMake.cmake

@@ -1,5 +1,12 @@
+
+# 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 VCExpress devenv 
+  NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
   PATHS
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup\\VS;EnvironmentDirectory]
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0\\Setup;Dbghelp_path]

+ 8 - 1
Modules/CMakeVS9FindMake.cmake

@@ -1,5 +1,12 @@
+
+# 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 VCExpress devenv 
+  NAMES ${_CMAKE_MAKE_PROGRAM_NAMES}
   PATHS
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup\\VS;EnvironmentDirectory]
   [HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0\\Setup;Dbghelp_path]