Bug 211375 - devel/extra-cmake-modules: Added TEST option, fixed dependencies + update to 5.25.0
Summary: devel/extra-cmake-modules: Added TEST option, fixed dependencies + update to ...
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: --- Affects Only Me
Assignee: Kurt Jaeger
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2016-07-26 02:35 UTC by Yuri Victorovich
Modified: 2016-09-03 19:35 UTC (History)
2 users (show)

See Also:
koobs: maintainer-feedback+
pi: merge-quarterly-


Attachments
patch (2.86 KB, patch)
2016-07-26 02:35 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff
patch (3.50 KB, patch)
2016-07-26 05:40 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff
patch (2.47 KB, patch)
2016-07-27 18:19 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff
patch (2.48 KB, patch)
2016-07-27 18:20 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff
patch (3.10 KB, patch)
2016-08-13 13:26 UTC, Yuri Victorovich
yuri: maintainer-approval+
Details | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Yuri Victorovich freebsd_committer freebsd_triage 2016-07-26 02:35:27 UTC
Created attachment 172984 [details]
patch

This patch:
* Adds TEST port option to match BUILD_TESTING cmake option
 - CAVEAT: TEST=off is currently broken, see upstream bug# in Makefile
* DOCS requires qcollectiongenerator, added it via QT5=help
* TEST requires QT5=buildtools_build,linguisttools_build,qmake_build
* Patches FindQCollectionGenerator cmake test for the correct binary path under qt5/

Passes poudriere on 10.3 amd64
Comment 1 Yuri Victorovich freebsd_committer freebsd_triage 2016-07-26 05:40:29 UTC
Created attachment 172985 [details]
patch

* Added HELP option to build the QtHelp file.

Passes poudriere 10.3 amd64.
Comment 2 Dmitry Marakasov freebsd_committer freebsd_triage 2016-07-27 12:24:07 UTC
+    PATHS
+        ${CMAKE_INSTALL_PREFIX}/lib/qt5/bin

doesn't seem correct. You should search in ${LOCALBASE}, not ${PREFIX}. May probably use $ENV{LOCALBASE} while adding LOCALBASE into CONFIGURE_ENV
Comment 3 Yuri Victorovich freebsd_committer freebsd_triage 2016-07-27 17:52:17 UTC
I think this is a bug in the upstream .cmake, because how come everything else is normally found but not this executable. Will see what can be done.
Comment 4 Yuri Victorovich freebsd_committer freebsd_triage 2016-07-27 17:53:22 UTC
Will need to add the custom executable search path, will do that.
Comment 5 Yuri Victorovich freebsd_committer freebsd_triage 2016-07-27 18:19:09 UTC
Created attachment 173057 [details]
patch
Comment 6 Yuri Victorovich freebsd_committer freebsd_triage 2016-07-27 18:20:04 UTC
Created attachment 173058 [details]
patch
Comment 7 Kubilay Kocak freebsd_committer freebsd_triage 2016-07-28 09:32:16 UTC
Thanks Yuri.

Note: please set ? flags to + when providing feedback, instead of cancelling them (the prior state is lost otherwise)
Comment 8 Yuri Victorovich freebsd_committer freebsd_triage 2016-07-28 16:56:01 UTC
Ok Kubilay.
Comment 9 Yuri Victorovich freebsd_committer freebsd_triage 2016-08-13 13:26:04 UTC
Created attachment 173628 [details]
patch

Also updates to 5.25.0
Comment 10 Yuri Victorovich freebsd_committer freebsd_triage 2016-08-13 13:26:54 UTC
Passes poudriere 10.3 amd64
Comment 11 Kurt Jaeger freebsd_committer freebsd_triage 2016-08-31 19:30:50 UTC
testbuilds are OK, give or take a few binutils hickups...
Comment 12 commit-hook freebsd_committer freebsd_triage 2016-08-31 19:31:47 UTC
A commit references this bug:

Author: pi
Date: Wed Aug 31 19:30:52 UTC 2016
New revision: 421185
URL: https://svnweb.freebsd.org/changeset/ports/421185

Log:
  devel/extra-cmake-modules: 5.24.0 -> 5.25.0

  - Add TEST port option to match BUILD_TESTING cmake option
    o CAVEAT: TEST=off is currently broken, see upstream bug# in Makefile
  - DOCS requires qcollectiongenerator, added it via QT5=help
  - TEST requires QT5=buildtools_build,linguisttools_build,qmake_build
  - Patches FindQCollectionGenerator cmake test for the correct binary
    path under qt5/

  PR:		211375
  MFH:		2016Q3
  Submitted by:	Yuri Victorovich <yuri@rawbw.com> (maintainer)

Changes:
  head/devel/extra-cmake-modules/Makefile
  head/devel/extra-cmake-modules/distinfo
  head/devel/extra-cmake-modules/pkg-plist
Comment 13 Kurt Jaeger freebsd_committer freebsd_triage 2016-09-03 14:40:49 UTC
If maintainer does not say otherwise, we'll not MFH, as it would include other changes since 5.22.0.
Comment 14 Yuri Victorovich freebsd_committer freebsd_triage 2016-09-03 16:57:38 UTC
Okay.