Midori Web Browser

Merge lp:~midori/midori/compileTypeLib into lp:midori

  1. compileTypeLib
  2. Merge into trunk
Proposed by Cris Dywan
Status: Merged
Approved by: gue5t gue5t
Approved revision: 6984
Merged at revision: 6984
Proposed branch: lp:~midori/midori/compileTypeLib
Merge into: lp:midori
Diff against target: 23 lines (+7/-0)
1 file modified
cmake/GIR.cmake (+7/-0)
To merge this branch: bzr merge lp:~midori/midori/compileTypeLib
Reviewer Review Type Date Requested Status
gue5t gue5t Approve
Review via email: mp+263976@code.launchpad.net

Commit message

Compile typelib from gir

To post a comment you must log in.
Revision history for this message
gue5t gue5t (gue5t) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'cmake/GIR.cmake'
2--- cmake/GIR.cmake 2014-03-04 14:41:28 +0000
3+++ cmake/GIR.cmake 2015-07-06 21:03:22 +0000
4@@ -19,6 +19,11 @@
5 -o ${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.gir
6 WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
7 DEPENDS ${CMAKE_PROJECT_NAME})
8+ add_custom_target ("g-ir-compiler_${module}" ALL
9+ ${GIR_COMPILER_BIN} ${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.gir
10+ --output ${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.typelib
11+ WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
12+ DEPENDS g-ir-scanner_${module})
13
14 endmacro (gir_build module namespace)
15
16@@ -27,5 +32,7 @@
17
18 install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.gir"
19 DESTINATION "${CMAKE_INSTALL_DATADIR}/gir-1.0/")
20+ install (FILES "${CMAKE_CURRENT_BINARY_DIR}/${namespace}-${GIR_VERSION}.typelib"
21+ DESTINATION "${CMAKE_INSTALL_LIBDIR}/girepository-1.0/")
22 endmacro (gir module)
23 endif ()

Subscribers

People subscribed via source and target branches

to all changes: