Title: [172376] trunk
- Revision
- 172376
- Author
- [email protected]
- Date
- 2014-08-10 00:09:47 -0700 (Sun, 10 Aug 2014)
Log Message
[GTK] Child processes should be installed in a versioned directory
https://bugs.webkit.org/show_bug.cgi?id=135754
Reviewed by Gustavo Noronha Silva.
Define LIBEXEC_INSTALL_DIR as
${CMAKE_INSTALL_FULL_LIBEXECDIR}/webkitgtk-${WEBKITGTK_API_VERSION}
so that the child processes are installed in $libexec/webkitgtk-4.0.
This makes it possible to install 2.6 in parallel to older versions.
* Source/cmake/OptionsGTK.cmake:
Modified Paths
Diff
Modified: trunk/ChangeLog (172375 => 172376)
--- trunk/ChangeLog 2014-08-10 04:34:34 UTC (rev 172375)
+++ trunk/ChangeLog 2014-08-10 07:09:47 UTC (rev 172376)
@@ -1,3 +1,17 @@
+2014-08-10 Carlos Garcia Campos <[email protected]>
+
+ [GTK] Child processes should be installed in a versioned directory
+ https://bugs.webkit.org/show_bug.cgi?id=135754
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Define LIBEXEC_INSTALL_DIR as
+ ${CMAKE_INSTALL_FULL_LIBEXECDIR}/webkitgtk-${WEBKITGTK_API_VERSION}
+ so that the child processes are installed in $libexec/webkitgtk-4.0.
+ This makes it possible to install 2.6 in parallel to older versions.
+
+ * Source/cmake/OptionsGTK.cmake:
+
2014-08-08 Alex Christensen <[email protected]>
Progress towards using CMake on Mac.
Modified: trunk/Source/cmake/OptionsGTK.cmake (172375 => 172376)
--- trunk/Source/cmake/OptionsGTK.cmake 2014-08-10 04:34:34 UTC (rev 172375)
+++ trunk/Source/cmake/OptionsGTK.cmake 2014-08-10 07:09:47 UTC (rev 172376)
@@ -20,7 +20,7 @@
# CMAKE_INSTALL_* variables that are populated by the GNUInstallDirs macro.
set(LIB_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBDIR}" CACHE PATH "Absolute path to library installation directory")
set(EXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_BINDIR}" CACHE PATH "Absolute path to executable installation directory")
-set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}" CACHE PATH "Absolute path to install executables executed by the library")
+set(LIBEXEC_INSTALL_DIR "${CMAKE_INSTALL_FULL_LIBEXECDIR}/webkitgtk-${WEBKITGTK_API_VERSION}" CACHE PATH "Absolute path to install executables executed by the library")
set(DATA_BUILD_DIR "${CMAKE_BINARY_DIR}/share/${WebKit_OUTPUT_NAME}")
set(DATA_INSTALL_DIR "${CMAKE_INSTALL_DATADIR}/webkitgtk-${WEBKITGTK_API_VERSION}")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
