From 43a243c161a6f57acf1752135c48aa111ef73cfb Mon Sep 17 00:00:00 2001
From: Robert Osfield <robert@openscenegraph.com>
Date: Tue, 2 Oct 2007 20:56:56 +0000
Subject: [PATCH] Changed the search for Qt version to prevent problems when
 having both Qt3 and Qt4 installed on one machine.

---
 CMakeLists.txt | 29 +++++++++++++++++++++++------
 1 file changed, 23 insertions(+), 6 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5c454d57a..28c480a08 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -91,7 +91,7 @@ IF(WIN32)
     ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
     ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
     #needed for net plugin
-    SET (OSG_SOCKET_LIBS wsock32.lib)
+    SET (OSG_SOCKET_LIBS wsock32)
     # Both Cygwin and Msys need -DNOMINMAX ???
     IF(UNIX)
         ADD_DEFINITIONS(-DNOMINMAX)
@@ -179,14 +179,31 @@ FIND_PACKAGE(Performer)
 FIND_PACKAGE(ZLIB)
 FIND_PACKAGE(GDAL)
 
-# SET(DESIRED_QT_VERSION 3)
-# FIND_PACKAGE(Qt)
-FIND_PACKAGE(Qt3)
-FIND_PACKAGE(Qt4)
-
 SET(wxWidgets_USE_LIBS base core gl net)
 FIND_PACKAGE(wxWidgets)
 
+# To select a specific version of QT define DESIRED_QT_VERSION
+# via cmake -DDESIRED_QT_VERSION=4
+IF  (DESIRED_QT_VERSION)
+
+    IF  (DESIRED_QT_VERSION MATCHES 4)
+      FIND_PACKAGE(Qt4)
+    ELSE(DESIRED_QT_VERSION MATCHES 4)
+      FIND_PACKAGE(Qt3)
+    ENDIF(DESIRED_QT_VERSION MATCHES 4)
+    
+ELSE(DESIRED_QT_VERSION)
+
+    FIND_PACKAGE(Qt4)
+    
+    IF  (NOT QT4_FOUND)
+        FIND_PACKAGE(Qt3)
+    ENDIF(NOT QT4_FOUND)
+    
+ENDIF(DESIRED_QT_VERSION)
+
+
+
 # Platform specific:
 # (We can approach this one of two ways. We can try to FIND everything
 # and simply check if we found the packages before actually building