From 6096af0b991334ef6d68c1da428ea7581745db8d Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Tue, 15 May 2007 11:31:09 +0000 Subject: [PATCH] From Mathieu Marache, "I tried the latest developper release 1.9.4 and found that I hadn't the osgsimpleviewerQt4 example in my Visual studio solutions... After looking into it it seems that you cannot have both Qt3 and Qt4 enabled. After modifying the root CMakeLists.txt to use : FIND_PACKAGE(Qt) which should ask you to choose betwwen Qt3 and Qt4 if you have both instead of : FIND_PACKAGE(Qt3) FIND_PACKAGE(Qt4) I had the project generated. But then due to the way CMake handles Qt4 I had to modify osgsimpleviewerQt4's CMakeLists.txt to have the binary link with QtOpengl4. " --- CMakeLists.txt | 3 +-- examples/osgsimpleviewerQT4/CMakeLists.txt | 4 ++++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 08f9231de..576acb3ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -121,8 +121,7 @@ FIND_PACKAGE(FLTK) FIND_PACKAGE(GLUT) FIND_PACKAGE(SDL) FIND_PACKAGE(Inventor) -FIND_PACKAGE(Qt3) -FIND_PACKAGE(Qt4) +FIND_PACKAGE(Qt) FIND_PACKAGE(Jasper) FIND_PACKAGE(COLLADA) FIND_PACKAGE(Xine) diff --git a/examples/osgsimpleviewerQT4/CMakeLists.txt b/examples/osgsimpleviewerQT4/CMakeLists.txt index a9e0e18a0..5ab40c686 100644 --- a/examples/osgsimpleviewerQT4/CMakeLists.txt +++ b/examples/osgsimpleviewerQT4/CMakeLists.txt @@ -1,3 +1,7 @@ +#configure what we need from Qt4 +SET(QT_USE_QTOPENGL yes) +INCLUDE(UseQt4) + SET(TARGET_SRC osgsimpleviewerQT4.cpp ) SET(TARGET_EXTERNAL_LIBRARIES ${QT_LIBRARIES} )