[GTK] Child processes should be installed in a versioned directory
authorcarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Aug 2014 07:09:47 +0000 (07:09 +0000)
committercarlosgc@webkit.org <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sun, 10 Aug 2014 07:09:47 +0000 (07:09 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@172376 268f45cc-cd09-0410-ab3c-d52691b4dbfc

ChangeLog
Source/cmake/OptionsGTK.cmake

index 244d190..98bc6f5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2014-08-10  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [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  <achristensen@webkit.org>
 
         Progress towards using CMake on Mac.
index 1b726d2..e7dbdc7 100644 (file)
@@ -20,7 +20,7 @@ set(ENABLE_WAYLAND_TARGET OFF CACHE BOOL "Whether to enable support for the Wayl
 # 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}")