Changeset 66716 in webkit


Ignore:
Timestamp:
Sep 2, 2010 11:20:11 PM (14 years ago)
Author:
commit-queue@webkit.org
Message:

2010-09-02 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Name install directories according to library name
​https://bugs.webkit.org/show_bug.cgi?id=45126

  • cmake/OptionsEfl.cmake: Use library name in order to define the data directory.

2010-09-02 Lucas De Marchi <​lucas.demarchi@profusion.mobi>

Reviewed by Antonio Gomes.

[EFL] Name install directories according to library name
​https://bugs.webkit.org/show_bug.cgi?id=45126

  • CMakeListsEfl.txt: include diretory follows library name.
  • ewebkit.pc.in: Ditto.
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/ChangeLog

    r66715 r66716  
     12010-09-02  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Name install directories according to library name
     6        https://bugs.webkit.org/show_bug.cgi?id=45126
     7
     8        * cmake/OptionsEfl.cmake: Use library name in order to define the data
     9        directory.
     10
    1112010-09-02  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
    212

  • trunk/WebKit/efl/CMakeListsEfl.txt

    r66081 r66716  
    226226
    227227INSTALL(FILES ${EWebKit_HEADERS}
    228         DESTINATION include/EWebKit)
     228        DESTINATION include/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})

  • trunk/WebKit/efl/ChangeLog

    r66577 r66716  
     12010-09-02  Lucas De Marchi  <lucas.demarchi@profusion.mobi>
     2
     3        Reviewed by Antonio Gomes.
     4
     5        [EFL] Name install directories according to library name
     6        https://bugs.webkit.org/show_bug.cgi?id=45126
     7
     8        * CMakeListsEfl.txt: include diretory follows library name.
     9        * ewebkit.pc.in: Ditto.
     10
    1112010-08-31  Dave Hyatt  <hyatt@apple.com>
    212

  • trunk/WebKit/efl/ewebkit.pc.in

    r61733 r66716  
    1010Libs: -L${libdir} -lewebkit @EXTRA_EWEBKIT_LINK@
    1111Libs.private: @LIBS_PRIVATE@
    12 Cflags: -I${includedir}/EWebKit
     12Cflags: -I${includedir}/@WebKit_LIBRARY_NAME@-@PROJECT_VERSION_MAJOR@

  • trunk/cmake/OptionsEfl.cmake

    r65744 r66716  
    33SET(PROJECT_VERSION_PATCH 0)
    44SET(PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
    5 
    6 SET(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}-${PROJECT_VERSION})
    7 ADD_DEFINITIONS(-DDATA_DIR="${DATA_DIR}")
    85
    96ADD_DEFINITIONS(-DWTF_PLATFORM_EFL=1)
    … …  
    4643SET(WebCore_LIBRARY_NAME webcore_efl)
    4744SET(WebKit_LIBRARY_NAME ewebkit)
     45
     46SET(DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/${WebKit_LIBRARY_NAME}-${PROJECT_VERSION_MAJOR})
     47ADD_DEFINITIONS(-DDATA_DIR="${DATA_DIR}")
    4848
    4949WEBKIT_FEATURE(ENABLE_AS_IMAGE "Enable SVG as image" DEFAULT ON SVG)
Note: See TracChangeset for help on using the changeset viewer.