Show
Ignore:
Timestamp:
08/06/08 13:29:36 (5 months ago)
Author:
mbensi
Message:

merge with webkit revision 35588

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/GeneratedSources/CMakeLists.txt

    r424 r431  
    384384) 
    385385 
     386#FIXME : pass this variable from HtmlExt 
     387IF (WEBKIT_USE_HTML_EXTENSION) 
     388    SET (IDL_BINDINGS_EXT 
     389        ../HtmlExt/HtmlElement/HTMLPleyoElement.idl 
     390    ) 
     391    SET (IDL_BINDINGS 
     392        ${IDL_BINDINGS} 
     393        ${IDL_BINDINGS_EXT} 
     394    ) 
     395ENDIF (WEBKIT_USE_HTML_EXTENSION) 
     396 
    386397# create these files at build time on demand, NOT everytime at cmake-time, Alex 
    387398FOREACH (idl ${IDL_BINDINGS}) 
    …… 
    446457        ) 
    447458     ENDIF (HTML_FEATURES) 
     459ELSE (NOT WEBKIT_USE_HTML_EXTENSION) 
     460    INCLUDE (${CMAKE_SOURCE_DIR}/HtmlExt/Resources/CMakeLists.txt) 
    448461ENDIF (NOT WEBKIT_USE_HTML_EXTENSION) 
    449462 
    …… 
    663676ENDIF (${OWBAL_PLATFORM_GRAPHICS} STREQUAL "GTK") 
    664677 
     678IF (WEBKIT_USE_HTML_EXTENSION) 
     679    INCLUDE_DIRECTORIES ( 
     680        ${CMAKE_SOURCE_DIR}/HtmlExt/HtmlElement 
     681        ${CMAKE_SOURCE_DIR}/HtmlExt/Renderer 
     682    ) 
     683ENDIF (WEBKIT_USE_HTML_EXTENSION) 
     684 
    665685LIST (APPEND GENERATED_SRC 
    666686    ${CMAKE_BINARY_DIR}/generated_sources/kjs/grammar.cpp