This commit is contained in:
Gael Guennebaud
2008-09-08 17:08:27 +00:00
parent 31c33b9ed4
commit c41ceee750
3 changed files with 12 additions and 9 deletions

View File

@@ -1,17 +1,20 @@
FIND_PACKAGE(Qt4 REQUIRED)
find_package(Qt4 REQUIRED)
find_package(OpenGL REQUIRED)
set(QT_USE_QTOPENGL TRUE)
include(${QT_USE_FILE})
SET(CMAKE_INCLUDE_CURRENT_DIR ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
INCLUDE_DIRECTORIES( ${QT_INCLUDE_DIR} )
include_directories( ${QT_INCLUDE_DIR} )
SET(quaternion_demo_SRCS gpuhelper.cpp camera.cpp trackball.cpp quaternion_demo.cpp)
set(quaternion_demo_SRCS gpuhelper.cpp camera.cpp trackball.cpp quaternion_demo.cpp)
QT4_AUTOMOC(${quaternion_demo_SRCS})
qt4_automoc(${quaternion_demo_SRCS})
ADD_EXECUTABLE(quaternion_demo ${quaternion_demo_SRCS})
add_executable(quaternion_demo ${quaternion_demo_SRCS})
TARGET_LINK_LIBRARIES(quaternion_demo ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY})
target_link_libraries(quaternion_demo
${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}
${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} )

View File

@@ -71,7 +71,7 @@ class GpuHelper
GLenum matrixTarget);
/** Make the matrix \a matrixTarget the current OpenGL matrix target.
Call this function before loadMatrix() or multMatrix() if you cannot guarrantee that glMatrixMode()
Call this function before loadMatrix() or multMatrix() if you cannot guarantee that glMatrixMode()
has never been called after the last loadMatrix() or multMatrix() calls.
\todo provides a debug mode checking the sanity of the cached matrix mode.
*/