[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdesrc-build] /: Re-fix my module search path fixup.
From:       Michael Pyne <null () kde ! org>
Date:       2017-08-01 1:47:03
Message-ID: E1dcMH1-0005dt-BN () code ! kde ! org
[Download RAW message or body]

Git commit 0c565a6ad97844c66443bd82150de157ec3a5a17 by Michael Pyne.
Committed on 01/08/2017 at 01:45.
Pushed by mpyne into branch 'master'.

Re-fix my module search path fixup.

I thought KF5 had removed /apps/ from the DATA_INSTALL_DIR, and so
adjusted the CMakeLists.txt install to match when it turned out my
module search paths were wrong.  Turns out /apps/ is used, so put that
path and adjust module search paths instead.

M  +2    -2    CMakeLists.txt
M  +1    -1    kdesrc-build
M  +1    -1    modules/ksb/Application.pm

https://commits.kde.org/kdesrc-build/0c565a6ad97844c66443bd82150de157ec3a5a17

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 64d31ef..69d622d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -22,8 +22,8 @@ if (ECM_FOUND)
     endif()
 else()
     message(WARNING "Did not find extra-cmake-modules; documentation will not be \
                built and install paths will be guessed based on CMake settings.")
-    # ECM sets DATA_INSTALL_DIR to PREFIX/share, try to match
-    set(DATA_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/share" CACHE PATH "The parent \
directory where applications can install their data") +    # ECM sets \
DATA_INSTALL_DIR to PREFIX/share/apps, try to match +    set(DATA_INSTALL_DIR  \
"${CMAKE_INSTALL_PREFIX}/share/apps" CACHE PATH "The parent directory where \
                applications can install their data")
     set(BIN_INSTALL_DIR   "${CMAKE_INSTALL_PREFIX}/bin"  CACHE PATH "The install dir \
for executables")  endif()
 
diff --git a/kdesrc-build b/kdesrc-build
index 3265945..ff25a2b 100755
--- a/kdesrc-build
+++ b/kdesrc-build
@@ -33,7 +33,7 @@
 # Adding an option? Grep for 'defaultGlobalOptions' in ksb::BuildContext --mpyne
 
 use FindBin qw($RealBin);
-use lib "$RealBin/../share/kdesrc-build/modules";
+use lib "$RealBin/../share/apps/kdesrc-build/modules";
 use lib "$RealBin/modules";
 
 # Force all symbols to be in this package. We can tell if we're being called
diff --git a/modules/ksb/Application.pm b/modules/ksb/Application.pm
index a4c2717..44cfbb0 100644
--- a/modules/ksb/Application.pm
+++ b/modules/ksb/Application.pm
@@ -2346,7 +2346,7 @@ sub _installCustomSessionDriver
     my $xdgDataHome = $ENV{XDG_DATA_HOME} || "$ENV{HOME}/.local/share";
 
     # First we have to find the source
-    my @searchPaths = ($RealBin, map { "$_/kdesrc-build" } ($xdgDataHome, \
@xdgDataDirs)); +    my @searchPaths = ($RealBin, map { "$_/apps/kdesrc-build" } \
($xdgDataHome, @xdgDataDirs));  
     s{/+$}{}   foreach @searchPaths; # Remove trailing slashes
     s{//+}{/}g foreach @searchPaths; # Remove duplicate slashes


[prev in list] [next in list] [prev in thread] [next in thread]