FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the search for Qt version to prevent problems when having both Qt3 and Qt4 installed on one machine.

Browse Source
This commit is contained in:
Robert Osfield 2007-10-02 20:56:56 +00:00
parent ce79b7efd5
commit 43a243c161
1 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
CMakeLists.txt
View File

@ -91,7 +91,7 @@ IF(WIN32)
ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS) ADD_DEFINITIONS(-D_SCL_SECURE_NO_WARNINGS)
ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE) ADD_DEFINITIONS(-D_CRT_SECURE_NO_DEPRECATE)
#needed for net plugin #needed for net plugin
SET (OSG_SOCKET_LIBS wsock32.lib) SET (OSG_SOCKET_LIBS wsock32)
# Both Cygwin and Msys need -DNOMINMAX ??? # Both Cygwin and Msys need -DNOMINMAX ???
IF(UNIX) IF(UNIX)
ADD_DEFINITIONS(-DNOMINMAX) ADD_DEFINITIONS(-DNOMINMAX)
@ -179,14 +179,31 @@ FIND_PACKAGE(Performer)
FIND_PACKAGE(ZLIB) FIND_PACKAGE(ZLIB)
FIND_PACKAGE(GDAL) 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) SET(wxWidgets_USE_LIBS base core gl net)
FIND_PACKAGE(wxWidgets) 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: # Platform specific:
# (We can approach this one of two ways. We can try to FIND everything # (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 # and simply check if we found the packages before actually building