[QGIS Commit] r11443 - in trunk/qgis: cmake python

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-08-19 15:09:10 -0400 (Wed, 19 Aug 2009)
New Revision: 11443

Modified:
   trunk/qgis/cmake/Python.cmake
   trunk/qgis/python/CMakeLists.txt
Log:
improve nmake detection

Modified: trunk/qgis/cmake/Python.cmake
===================================================================
--- trunk/qgis/cmake/Python.cmake	2009-08-19 16:45:20 UTC (rev 11442)
+++ trunk/qgis/cmake/Python.cmake	2009-08-19 19:09:10 UTC (rev 11443)
@@ -103,6 +103,19 @@
   ENDIF (PYTHONINTERP_FOUND)
 ENDMACRO (TRY_RUN_PYTHON)
 
+IF(MSVC)
+  FIND_PROGRAM(SIP_MAKE_PROGRAM
+                NAMES nmake.exe
+                PATHS "$ENV{VCINSTALLDIR}/bin" "$ENV{PROGRAMFILES}/Microsoft Visual 9.0/VC/bin"
+        )
+  IF(NOT SIP_MAKE_PROGRAM)
+    MESSAGE(FATAL_ERROR "nmake not found")
+  ENDIF(NOT SIP_MAKE_PROGRAM)
+ELSE (MSVC)
+  SET(SIP_MAKE_PROGRAM ${CMAKE_MAKE_PROGRAM})
+ENDIF (MSVC)
+
+
 # enable/disable python support (mapserver export tool and bindings)
 IF (PYTHON_LIBRARIES AND PYTHON_INCLUDE_PATH)
   SET (PYTHON_FOUND TRUE)

Modified: trunk/qgis/python/CMakeLists.txt
===================================================================
--- trunk/qgis/python/CMakeLists.txt	2009-08-19 16:45:20 UTC (rev 11442)
+++ trunk/qgis/python/CMakeLists.txt	2009-08-19 19:09:10 UTC (rev 11443)
@@ -42,7 +42,6 @@
                
 IF (MSVC)
   SET(EXPORT "__declspec(dllimport)")
-  SET(CMAKE_MAKE_PROGRAM $ENV{VCINSTALLDIR}/bin/nmake.exe)
 ELSE (MSVC)
   SET(EXPORT "")
 ENDIF (MSVC)
@@ -60,11 +59,11 @@
 
 # Step 3: run make in core and gui subdirs
 ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_CORE_LIB} PRE_LINK
-                   COMMAND ${CMAKE_MAKE_PROGRAM}
+                   COMMAND ${SIP_MAKE_PROGRAM}
                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/core
                    DEPENDS ${BINDINGS_CORE_MAKEFILE})
 ADD_CUSTOM_COMMAND(OUTPUT ${BINDINGS_GUI_LIB} PRE_LINK
-                   COMMAND ${CMAKE_MAKE_PROGRAM}
+                   COMMAND ${SIP_MAKE_PROGRAM}
                    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/gui
                    DEPENDS ${BINDINGS_GUI_MAKEFILE})