Changeset 10515:512a085effc0 in orange


Ignore:
Timestamp:
03/13/12 18:32:57 (2 years ago)
Author:
mstajdohar
Branch:
default
rebase_source:
dd93b1532816603f0fa63ecfad69094b1b2d820b
Message:

Removed building orangeqt 3D libs by default since there are some unresolved errors on some platforms (for example: Mint, Ubuntu).

Location:
source/orangeqt
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/orangeqt/CMakeLists.txt

    r9252 r10515  
    99find_package(SIP REQUIRED) 
    1010find_package(PythonLibrary REQUIRED) 
    11 find_package(OpenGL) 
     11#find_package(OpenGL) 
    1212find_package(Numpy) 
    1313include(SIPMacros) 
     
    2929    multicurve.cpp 
    3030    plot.cpp  
    31     plot3d.cpp 
    32     canvas3d.cpp 
    33     glextensions.cpp 
     31#    plot3d.cpp 
     32#    canvas3d.cpp 
     33#    glextensions.cpp 
    3434) 
    3535qt4_automoc(${orangeqt_SRCS}) 
     
    5151set(SIP_EXTRA_OPTIONS "-k") 
    5252 
    53 set(SIP_EXTRA_LINK_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) 
     53#set(SIP_EXTRA_LINK_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY}) 
     54set(SIP_EXTRA_LINK_LIBRARIES ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY}) 
    5455set(SIP_EXTRA_SOURCES ${orangeqt_SRCS}) 
    5556 
  • source/orangeqt/orangeqt.sip

    r9057 r10515  
    22 
    33%Import QtGui/QtGuimod.sip 
    4 %Import QtOpenGL/QtOpenGLmod.sip  
     4/*%Import QtOpenGL/QtOpenGLmod.sip*/ 
    55 
    66%Include types.sip 
    77%Include plot.sip 
    8 %Include plot3d.sip 
    9 %Include canvas3d.sip 
     8/*%Include plot3d.sip 
     9%Include canvas3d.sip*/ 
    1010%Include plotitem.sip 
    1111%Include point.sip 
Note: See TracChangeset for help on using the changeset viewer.