From 76044da92c25e857f382fd3646b9469b79a02bee Mon Sep 17 00:00:00 2001
From: timlinux <timlinux@c8812cc2-4d05-0410-92ff-de0c093fc19c>
Date: Tue, 9 Oct 2007 15:57:59 +0000
Subject: [PATCH] Fix for trying to call winmain instead of main when compiled
 with msvc. Link to qtmain when building with msvc (fixes crash on app start
 up when building in release mode). Dont show console when building on win.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7256 c8812cc2-4d05-0410-92ff-de0c093fc19c
---
 CMakeLists.txt         |  3 +++
 src/app/CMakeLists.txt | 10 +++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 277cdfe81e55..b645322aaeef 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -146,6 +146,9 @@ IF (WIN32)
   SET (QGIS_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/include)
   SET (QGIS_SOURCE_DIR ${CMAKE_SOURCE_DIR})
   IF(MSVC)
+    #tell msvc compiler to use main instead of winmain as the
+    #application entry point
+    SET(QT_USE_QTMAIN TRUE) 
     # Turn on defines for non standard maths stuff
     ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
 
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index f52d41f59e77..52bcba75930d 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -208,13 +208,21 @@ ENDIF (PYTHON_FOUND)
 
 #############
 
-ADD_EXECUTABLE(qgis ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS})
+IF (WIN32)
+  ADD_EXECUTABLE(qgis ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS} WIN32)
+ELSEIF (WIN32)
+  ADD_EXECUTABLE(qgis ${QGIS_APP_SRCS} ${QGIS_APP_MOC_SRCS})
+ENDIF (WIN32)
 
 TARGET_LINK_LIBRARIES(qgis
   ${QT_LIBRARIES}
   qgis_core
   qgis_gui
   )
+IF (MSVC)
+  #This resolves issues like cant find winmain etc
+  TARGET_LINK_LIBRARIES(qgis qtmain)
+ENDIF (MSVC)
 
 SET_TARGET_PROPERTIES(qgis PROPERTIES
   INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib