[kdesrc-build] [Bug 395627] CMAKE_{PREFIX,MODULE}_PATH not set at all

2018-07-01 Thread Michael Pyne
https://bugs.kde.org/show_bug.cgi?id=395627

Michael Pyne  changed:

   What|Removed |Added

 Status|CONFIRMED   |RESOLVED
  Latest Commit||https://commits.kde.org/kde
   ||src-build/7f92da7b307c784de
   ||ec804f65137b10733e6a88e
 Resolution|--- |FIXED
   Version Fixed In||18.08

--- Comment #4 from Michael Pyne  ---
Git commit 7f92da7b307c784deec804f65137b10733e6a88e by Michael Pyne.
Committed on 01/07/2018 at 23:15.
Pushed by mpyne into branch 'master'.

Don't double-set CMAKE_PREFIX_PATH if set by user.

This fixes bug 395627, where the error is actually that we set
CMAKE_PREFIX_PATH twice if qtdir is set to a non-system path and the
user is also setting CMAKE_PREFIX_PATH.

Unfortunately the second value overrides the first (the one the user
set).

Also added a test for this, which fails before the fix and passes
afterwards. The full test suite (all 5...) pass.
FIXED-IN:18.08

M  +5-2modules/ksb/BuildSystem/KDE4.pm
A  +78   -0t/bug-395627-keep-cmake-prefix.t
A  +26   -0t/data/bug-395627/kdesrc-buildrc

https://commits.kde.org/kdesrc-build/7f92da7b307c784deec804f65137b10733e6a88e

-- 
You are receiving this mail because:
You are watching all bug changes.

[kdesrc-build] [Bug 395627] CMAKE_{PREFIX,MODULE}_PATH not set at all

2018-06-20 Thread Michael Pyne
https://bugs.kde.org/show_bug.cgi?id=395627

--- Comment #3 from Michael Pyne  ---
Actually now that I look at the revert, that fixed a different bug too.

The problem here was that CMAKE_PREFIX_PATH *was* being set (to Qt's path,
under /usr). The bug is that we shouldn't have replaced the CMAKE_PREFIX_PATH
you'd already set, if we were going to add Qt's then that needs to be an
addition, not a replacement.

So I'll hold off on reverting but this does still need to be fixed properly.

-- 
You are receiving this mail because:
You are watching all bug changes.

[kdesrc-build] [Bug 395627] CMAKE_{PREFIX,MODULE}_PATH not set at all

2018-06-20 Thread Michael Pyne
https://bugs.kde.org/show_bug.cgi?id=395627

Michael Pyne  changed:

   What|Removed |Added

 Ever confirmed|0   |1
 Status|UNCONFIRMED |CONFIRMED

--- Comment #2 from Michael Pyne  ---
Knowing the git commit helps. I'll revert for now and then see if I can fix and
add a testcase to prevent recurrence.

-- 
You are receiving this mail because:
You are watching all bug changes.

[kdesrc-build] [Bug 395627] CMAKE_{PREFIX,MODULE}_PATH not set at all

2018-06-20 Thread Denis Kurz
https://bugs.kde.org/show_bug.cgi?id=395627

--- Comment #1 from Denis Kurz  ---
Using git bisect, I found the commit that broke it for me:

https://phabricator.kde.org/R365:51f20932df47f0b96b41ef22960b5600e0e65800

I don't know perl, so I can only guess that /something/ (that involves
CMAKE_PREFIX_PATH) happens if $qtdir != $prefix. If $prefix is kdedir, and
$qtdir is qtdir from the config file, then those two clearly differ in my
config.

As a workaround, both of the following steps cured the problem for me:
 * Revert the above commit on master, or alternatively
 * Removing the "qtdir /usr" line from my config, which was not needed anyway.

(not both steps are required; they each fix it separately)

-- 
You are receiving this mail because:
You are watching all bug changes.