Changeset 8327:ae85b078c32f in orange


Ignore:
Timestamp:
06/22/11 10:26:20 (3 years ago)
Author:
Noughmad <Noughmad@…>
Branch:
default
Convert:
92e53733d13d07ca2deba1cf5a7d0fab844bbe71
Message:

Try to fix build error on Windows.

Location:
source/orangegraph
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • source/orangegraph/curve.cpp

    r8325 r8327  
    2929QRectF Curve::boundingRect() const 
    3030{ 
    31  
     31    return QRectF(); 
    3232} 
    3333 
  • source/orangegraph/modules/SIPMacros.cmake

    r8325 r8327  
    3535# SIP_EXTRA_OPTIONS - Extra command line options which should be passed on to 
    3636#     SIP. 
     37# 
     38# SIP_EXTRA_SOURCES - Additional source files to compile into the library 
     39# 
     40# SIP_EXTRA_LINK_LIBRARIES - Additional libraries to link to 
     41# 
    3742 
    3843SET(SIP_INCLUDES) 
     
    4146SET(SIP_DISABLE_FEATURES) 
    4247SET(SIP_EXTRA_OPTIONS) 
     48SET(SIP_EXTRA_LINK_LIBRARIES) 
     49SET(SIP_EXTRA_SOURCES) 
    4350 
    4451MACRO(ADD_SIP_PYTHON_MODULE MODULE_NAME MODULE_SIP) 
     
    112119    # not sure if type MODULE could be uses anywhere, limit to cygwin for now 
    113120    IF (CYGWIN) 
    114         ADD_LIBRARY(${_logical_name} MODULE ${_sip_output_files} ) 
     121        ADD_LIBRARY(${_logical_name} MODULE ${SIP_EXTRA_SOURCES} ${_sip_output_files} ) 
    115122    ELSE (CYGWIN) 
    116         ADD_LIBRARY(${_logical_name} SHARED ${_sip_output_files} ) 
     123        ADD_LIBRARY(${_logical_name} SHARED ${SIP_EXTRA_SOURCES} ${_sip_output_files} ) 
    117124    ENDIF (CYGWIN) 
    118     TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY}) 
    119     TARGET_LINK_LIBRARIES(${_logical_name} ${EXTRA_LINK_LIBRARIES}) 
     125    TARGET_LINK_LIBRARIES(${_logical_name} ${PYTHON_LIBRARY} ${SIP_EXTRA_LINK_LIBRARIES} ${EXTRA_LINK_LIBRARIES}) 
    120126    SET_TARGET_PROPERTIES(${_logical_name} PROPERTIES PREFIX "" OUTPUT_NAME ${_child_module_name}) 
    121127 
Note: See TracChangeset for help on using the changeset viewer.