diff options
| author | Carlos Hernandez <chernand@google.com> | 2014-08-05 17:53:32 -0700 |
|---|---|---|
| committer | Carlos Hernandez <chernand@google.com> | 2014-08-05 17:54:05 -0700 |
| commit | 7faaa9f3f0df9d23790277834d426c3d992ac3ba (patch) | |
| tree | b788ae3b96daf9f5a79d8ec434e1e9edd56b3a72 /demos | |
| parent | 810535bb0c575a003b32076e5352ab8fd3f23a1c (diff) | |
| download | eigen-7faaa9f3f0df9d23790277834d426c3d992ac3ba.tar.gz | |
Update Eigen to the latest stable release, 3.2.2android-wear-5.1.1_r1android-wear-5.1.0_r1android-wear-5.0.0_r1android-l-preview_r2android-cts-5.1_r9android-cts-5.1_r8android-cts-5.1_r7android-cts-5.1_r6android-cts-5.1_r5android-cts-5.1_r4android-cts-5.1_r3android-cts-5.1_r28android-cts-5.1_r27android-cts-5.1_r26android-cts-5.1_r25android-cts-5.1_r24android-cts-5.1_r23android-cts-5.1_r22android-cts-5.1_r21android-cts-5.1_r20android-cts-5.1_r2android-cts-5.1_r19android-cts-5.1_r18android-cts-5.1_r17android-cts-5.1_r16android-cts-5.1_r15android-cts-5.1_r14android-cts-5.1_r13android-cts-5.1_r10android-cts-5.1_r1android-cts-5.0_r9android-cts-5.0_r8android-cts-5.0_r7android-cts-5.0_r6android-cts-5.0_r5android-cts-5.0_r4android-cts-5.0_r3android-5.1.1_r9android-5.1.1_r8android-5.1.1_r7android-5.1.1_r6android-5.1.1_r5android-5.1.1_r4android-5.1.1_r38android-5.1.1_r37android-5.1.1_r36android-5.1.1_r35android-5.1.1_r34android-5.1.1_r33android-5.1.1_r30android-5.1.1_r3android-5.1.1_r29android-5.1.1_r28android-5.1.1_r26android-5.1.1_r25android-5.1.1_r24android-5.1.1_r23android-5.1.1_r22android-5.1.1_r20android-5.1.1_r2android-5.1.1_r19android-5.1.1_r18android-5.1.1_r17android-5.1.1_r16android-5.1.1_r15android-5.1.1_r14android-5.1.1_r13android-5.1.1_r12android-5.1.1_r10android-5.1.1_r1android-5.1.0_r5android-5.1.0_r4android-5.1.0_r3android-5.1.0_r1android-5.0.2_r3android-5.0.2_r1android-5.0.1_r1android-5.0.0_r7android-5.0.0_r6android-5.0.0_r5.1android-5.0.0_r5android-5.0.0_r4android-5.0.0_r3android-5.0.0_r2android-5.0.0_r1lollipop-wear-releaselollipop-releaselollipop-mr1-wfc-releaselollipop-mr1-releaselollipop-mr1-fi-releaselollipop-mr1-devlollipop-mr1-cts-releaselollipop-devlollipop-cts-releasel-preview
./Eigen/src/Core/util/NonMPL2.h is left untouched, so that
usage of non MPL2 code is disabled.
Change-Id: I86fc9257b3c30d0ca15b268d4ef07bf038bba7ca
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/opengl/CMakeLists.txt | 34 |
1 files changed, 21 insertions, 13 deletions
diff --git a/demos/opengl/CMakeLists.txt b/demos/opengl/CMakeLists.txt index b98a30c01..299aa441d 100644 --- a/demos/opengl/CMakeLists.txt +++ b/demos/opengl/CMakeLists.txt @@ -1,20 +1,28 @@ -find_package(Qt4 REQUIRED) -find_package(OpenGL REQUIRED) +find_package(Qt4) +find_package(OpenGL) -set(QT_USE_QTOPENGL TRUE) -include(${QT_USE_FILE}) +if(QT4_FOUND AND OPENGL_FOUND) -set(CMAKE_INCLUDE_CURRENT_DIR ON) + set(QT_USE_QTOPENGL TRUE) + include(${QT_USE_FILE}) -include_directories( ${QT_INCLUDE_DIR} ) + set(CMAKE_INCLUDE_CURRENT_DIR ON) -set(quaternion_demo_SRCS gpuhelper.cpp icosphere.cpp camera.cpp trackball.cpp quaternion_demo.cpp) + include_directories( ${QT_INCLUDE_DIR} ) -qt4_automoc(${quaternion_demo_SRCS}) + set(quaternion_demo_SRCS gpuhelper.cpp icosphere.cpp camera.cpp trackball.cpp quaternion_demo.cpp) -add_executable(quaternion_demo ${quaternion_demo_SRCS}) -add_dependencies(demos quaternion_demo) + qt4_automoc(${quaternion_demo_SRCS}) -target_link_libraries(quaternion_demo - ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} - ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} ) + add_executable(quaternion_demo ${quaternion_demo_SRCS}) + add_dependencies(demos quaternion_demo) + + target_link_libraries(quaternion_demo + ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} + ${QT_QTOPENGL_LIBRARY} ${OPENGL_LIBRARIES} ) + +else() + + message(STATUS "OpenGL demo disabled because Qt4 and/or OpenGL have not been found.") + +endif()
\ No newline at end of file |