diff options
| author |  Gael Guennebaud <g.gael@free.fr> | 2008-09-08 17:08:27 +0000 |
|---|---|---|
| committer | Gael Guennebaud <g.gael@free.fr> | 2008-09-08 17:08:27 +0000 |
| commit | c41ceee7508965a9f571e6b67f3e396943c6376c (patch) | |
| tree | bbabd9440c20d1d6e1703981f4409763ed75b1a5 /demos | |
| parent | 31c33b9ed44b351127b7b4da317dc5ab69670b6f (diff) | |
2 typos
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/opengl/CMakeLists.txt | 17 | ||||
| -rw-r--r-- | demos/opengl/gpuhelper.h | 2 |
2 files changed, 11 insertions, 8 deletions
diff --git a/demos/opengl/CMakeLists.txt b/demos/opengl/CMakeLists.txt index 8fd02551a..06b49459c 100644 --- a/demos/opengl/CMakeLists.txt +++ b/demos/opengl/CMakeLists.txt @@ -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} ) diff --git a/demos/opengl/gpuhelper.h b/demos/opengl/gpuhelper.h index a3770aafc..fd07d53fe 100644 --- a/demos/opengl/gpuhelper.h +++ b/demos/opengl/gpuhelper.h @@ -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. */ |