[QGIS Commit] r8288 - trunk/qgis

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2008-03-27 09:08:30 -0400 (Thu, 27 Mar 2008)
New Revision: 8288

Modified:
   trunk/qgis/CMakeLists.txt
Log:
Fix for msvc so python parts build with nmake not vcexpress


Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2008-03-27 12:27:48 UTC (rev 8287)
+++ trunk/qgis/CMakeLists.txt	2008-03-27 13:08:30 UTC (rev 8288)
@@ -170,6 +170,17 @@
   SET (DEFAULT_INCLUDE_SUBDIR	include)
   
   IF (MSVC)
+    # Python parts need to be build with nmake not vcexpress
+    # if you dont add this clause, extra blank msvc projects
+    # will pop up mid way through the build process and block
+    # the build, plus the python bindings wont build correctly
+    SET (CMAKE_MAKE_PROGRAM nmake)
+    # put all the build products into a single directory
+    # under build (doesnt affect install target) to make for
+    # easier debugging.
+    SET(OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
+    SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
+    SET(LIBRARY_OUTPUT_PATH ${OUTPUT_DIR})
     #tell msvc compiler to use main instead of winmain as the
     #application entry point
     SET(QT_USE_QTMAIN TRUE)