Title: [172583] trunk
- Revision
- 172583
- Author
- [email protected]
- Date
- 2014-08-14 06:10:37 -0700 (Thu, 14 Aug 2014)
Log Message
[GTK] REGRESSION(r171598, CMake): Introspection files are installed at the wrong path
https://bugs.webkit.org/show_bug.cgi?id=135934
Reviewed by Gustavo Noronha Silva.
Since r171598 gir files are installed under $datadir/webkitgtk-4.0/gir-1.0/.
The gir files should installed in $datadir/gir-1.0/ together with all other
gir files. We don't need to install introspection files in a versioned
directory because their filenames already contain the binary version. But before
r171598, the files were only installed to the right directory if the
gobject-instrospection pkg-config file was in the same prefix than the one we
wanted to install, because the gir and typelibs directories were extracted from
the pkg-config file. We should define INTROSPECTION_INSTALL_GIRDIR and
INTROSPECTION_INSTALL_TYPELIBDIR in OptionsGTK.cmake based on $datadir and $libdir
like we do in the autotools build.
* Source/cmake/FindGObjectIntrospection.cmake: Do not define
INTROSPECTION_INSTALL_GIRDIR and INTROSPECTION_INSTALL_TYPELIBDIR.
* Source/cmake/OptionsGTK.cmake: Define
INTROSPECTION_INSTALL_GIRDIR and INTROSPECTION_INSTALL_TYPELIBDIR.
Modified Paths
Diff
Modified: trunk/ChangeLog (172582 => 172583)
--- trunk/ChangeLog 2014-08-14 11:13:02 UTC (rev 172582)
+++ trunk/ChangeLog 2014-08-14 13:10:37 UTC (rev 172583)
@@ -1,5 +1,28 @@
2014-08-14 Carlos Garcia Campos <[email protected]>
+ [GTK] REGRESSION(r171598, CMake): Introspection files are installed at the wrong path
+ https://bugs.webkit.org/show_bug.cgi?id=135934
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Since r171598 gir files are installed under $datadir/webkitgtk-4.0/gir-1.0/.
+ The gir files should installed in $datadir/gir-1.0/ together with all other
+ gir files. We don't need to install introspection files in a versioned
+ directory because their filenames already contain the binary version. But before
+ r171598, the files were only installed to the right directory if the
+ gobject-instrospection pkg-config file was in the same prefix than the one we
+ wanted to install, because the gir and typelibs directories were extracted from
+ the pkg-config file. We should define INTROSPECTION_INSTALL_GIRDIR and
+ INTROSPECTION_INSTALL_TYPELIBDIR in OptionsGTK.cmake based on $datadir and $libdir
+ like we do in the autotools build.
+
+ * Source/cmake/FindGObjectIntrospection.cmake: Do not define
+ INTROSPECTION_INSTALL_GIRDIR and INTROSPECTION_INSTALL_TYPELIBDIR.
+ * Source/cmake/OptionsGTK.cmake: Define
+ INTROSPECTION_INSTALL_GIRDIR and INTROSPECTION_INSTALL_TYPELIBDIR.
+
+2014-08-14 Carlos Garcia Campos <[email protected]>
+
[GTK] WebKit DOM documentation (webkitdomgtk) not installed after make install
https://bugs.webkit.org/show_bug.cgi?id=135836
Modified: trunk/Source/cmake/FindGObjectIntrospection.cmake (172582 => 172583)
--- trunk/Source/cmake/FindGObjectIntrospection.cmake 2014-08-14 11:13:02 UTC (rev 172582)
+++ trunk/Source/cmake/FindGObjectIntrospection.cmake 2014-08-14 13:10:37 UTC (rev 172583)
@@ -44,8 +44,6 @@
_gir_get_pkgconfig_var(INTROSPECTION_GENERATE "g_ir_generate" "")
_gir_get_pkgconfig_var(INTROSPECTION_GIRDIR "girdir" "")
_gir_get_pkgconfig_var(INTROSPECTION_TYPELIBDIR "typelibdir" "")
- _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_GIRDIR "girdir" "--define-variable=datadir=${DATA_INSTALL_DIR}")
- _gir_get_pkgconfig_var(INTROSPECTION_INSTALL_TYPELIBDIR "typelibdir" "--define-variable=libdir=${LIB_INSTALL_DIR}")
set(INTROSPECTION_CFLAGS "${_pc_gir_CFLAGS}")
set(INTROSPECTION_LIBS "${_pc_gir_LIBS}")
endif ()
@@ -59,6 +57,4 @@
INTROSPECTION_TYPELIBDIR
INTROSPECTION_CFLAGS
INTROSPECTION_LIBS
- INTROSPECTION_INSTALL_GIRDIR
- INTROSPECTION_INSTALL_TYPELIBDIR
)
Modified: trunk/Source/cmake/OptionsGTK.cmake (172582 => 172583)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-08-14 11:13:02 UTC (rev 172582)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-08-14 13:10:37 UTC (rev 172583)
@@ -25,6 +25,8 @@
set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
set(WEBKITGTK_HEADER_INSTALL_DIR "${CMAKE_INSTALL_INCLUDEDIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
+set(INTROSPECTION_INSTALL_GIRDIR "${CMAKE_INSTALL_FULL_DATADIR}/gir-1.0")
+set(INTROSPECTION_INSTALL_TYPELIBDIR "${LIB_INSTALL_DIR}/girepository-1.0")
find_package(Cairo 1.10.2 REQUIRED)
find_package(Fontconfig 2.8.0 REQUIRED)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
