94 Commits

Author SHA1 Message Date
dcoppa
b8b360d24a Fetch the right version of ruby from MODRUBY_REV automagically 2015-01-20 11:41:32 +00:00
dcoppa
10be5475f8 FindRuby.cmake: fix selection of version x.0
FindRuby.cmake: properly detect Ruby 2.2.0
2015-01-13 08:22:48 +00:00
dcoppa
f8ca00b39a Sync patches with upstream:
FindQt4: search for versioned qmake names first before general qmake
(upstream git commit 8de3f22e8fe9e798b63eb00e35eee6404748d3bd)

FindSDL: fix bad variable expansion
(upstream git commit fd329307b2ee76abaa41e25a300902a2fb983895)
2015-01-08 16:58:00 +00:00
dcoppa
7f3e75a1ad Update to cmake-3.1.0
Bulk build by landry@
KDE-related fixes by zhuk@
2014-12-31 11:06:02 +00:00
dcoppa
a1bc299a41 Remove '-O2' as default optimization 2014-11-04 13:50:24 +00:00
dcoppa
7ec769ac18 fix FindLua module; from upstream (Rolf Eike Beer) 2014-10-07 11:12:23 +00:00
dcoppa
285a26d8eb Do not register full paths to shared libraries in the ELF "NEEDED"
sections

tested in a bulk build by landry@

OK landry@, zhuk@
2014-10-03 10:11:45 +00:00
dcoppa
acaefb2ea3 Add missing bits of sthen's commit to disable ninja on m88k 2014-09-30 15:02:32 +00:00
dcoppa
490493c758 Simplify patch
Thanks to to Rolf Eike Beer for this too
2014-09-30 14:24:31 +00:00
dcoppa
1c1430857b committed upstream 2014-09-30 07:14:49 +00:00
dcoppa
e2d4083076 Shrug. Fix typo 2014-09-29 08:45:35 +00:00
dcoppa
d2034e3daa Merge OpenBSD-related fixes from upstream git
kudos to Rolf Eike Beer
2014-09-29 08:25:39 +00:00
dcoppa
98635e18ec Better safe than sorry
(adapted from upstream)
2014-09-28 18:15:40 +00:00
dcoppa
82ab6b97d7 Temporary workaround for a sporadic segfault which seems to result
from memory corruption. To be removed when CMake 3.1 will be released.
2014-09-28 17:06:24 +00:00
dcoppa
b47a9009fb Bugfixing update to cmake-3.0.2
Use Ninja-1.5's console pool to have visible output during long-running
tasks which produce status updates on the console (such as test suites)
2014-09-12 08:36:12 +00:00
dcoppa
3a81dce7db cleanup comments; zap a couple of now meaningless comments related
to java 1.6
2014-09-11 14:45:12 +00:00
dcoppa
4508f94c80 Update to cmake-3.0.1
Tested in a bulk build by landry@
OK landry@
2014-09-11 10:24:38 +00:00
dcoppa
03cd5905d0 Fix uninitialized variable 2014-05-13 05:55:30 +00:00
dcoppa
c7e4fe7084 kurt@ forgot Modules/FindJava.cmake in his commit (and, while here,
fix style).
2014-05-12 14:47:49 +00:00
kurt
46f312eaef - Unlink jdk/1.6 and make jdk/1.7 the default jdk for all java ports
- Adjust java.port.mk and cmake to use 1.7
- Adjust jdk/1.7 for pkg_add upgrades
okay sthen@, jasper@, ajacoutot@
2014-05-07 15:42:15 +00:00
dcoppa
bf77fb8bb3 FindPython{Interp,Libs}: Search for Python 3.4
(upstream git commit ab6201ab647c13fee44c44822b8502e9848faaaf)
2014-04-14 14:02:44 +00:00
dcoppa
0e646776af Teach FindRuby.cmake about the recently imported Ruby 2.1
ok zhuk@
2014-01-15 19:54:37 +00:00
dcoppa
f89f6198f8 Fixes for Freetype 2.5.x
Upstream git commits:
http://cmake.org/gitweb?p=cmake.git;a=commit;h=7435ae7c97590a0713d86b63add761d5e1607ec1
http://cmake.org/gitweb?p=cmake.git;a=commit;h=bc49d820a276243324003bc34d92a69194938adf
http://cmake.org/gitweb?p=cmake.git;a=commit;h=9b08e3f5993eb004e3eb0d9ae8b593f553989f89

OK naddy@
2014-01-10 08:21:12 +00:00
dcoppa
5ff455237f Bugfix update to cmake-2.8.12.1 2013-11-11 07:23:32 +00:00
zhuk
db08565fde Improve FindRuby.cmake and add support for Ruby 2.0.
input from and okay dcoppa@
2013-10-14 13:02:51 +00:00
dcoppa
15f66503d9 Update to cmake-2.8.12.
Tested in a bulk build by the usual suspects, Thanks!

ok espie@, kili@
ok zhuk@ for kde4
2013-10-14 12:58:02 +00:00
dcoppa
e65b5fe01b FindTCL: Add OpenBSD paths for Tcl/Tk 8.6 2013-09-30 11:18:09 +00:00
dcoppa
3bdc002930 CMake's built-in ELF parser is broken on arm:
> #0  cmELF (this=0xbfff4674, fname=0x4337438c "/usr/lib/libz.so.4.1")
>     at basic_ios.h:124
> 124           { return _M_streambuf_state; }

Since this is a requirement for Ninja, disable both of
them if ${MACHINE_ARCH} == "arm".

As a workaround, ok sthen@
2013-08-22 09:53:20 +00:00
dcoppa
55806b324e Missed in previous commit.
okay zhuk@
2013-08-16 10:37:22 +00:00
zhuk
4de8936a6a Unbreak (bulk) builds of Java-based apps using CMake: we force using JDK 1.6
to build MODJAVA_VER=1.6+ ports, and CMake should do the same. Otherwise we
could, e.g., pick up co-installed JDK 1.7, start build using it, and while
build process goes, JDK 1.7 may disappear...

Discovered while working on OpenCV 2.4, which contains Java bindings.

okay dcoppa@
2013-08-12 16:09:50 +00:00
dcoppa
2e1751cd73 Switch CMake to use ninja to build itself.
OK espie@; makes sense to sthen@
2013-06-28 14:58:23 +00:00
dcoppa
aef0e24117 Enable ELF parsing and editing support on OpenBSD.
Ninja will use it.

OK espie@
2013-06-25 07:16:46 +00:00
dcoppa
94327b4bf8 Bugfix update to cmake-2.8.11.1
See: http://public.kitware.com/Bug/changelog_page.php?version_id=113

OK jasper@, sthen@
2013-06-21 11:12:51 +00:00
dcoppa
93f64326b5 whitespace; no package changes 2013-06-07 13:26:27 +00:00
dcoppa
c5fccc6e51 Update to cmake-2.8.11.
Tested in a bulk build by landry@
Tested with KDE4 by zhuk@
OK zhuk@
2013-06-06 12:47:06 +00:00
dcoppa
d3c9deb6f1 Simplification
Minor fixes and cleanups
Put stuff where it belongs
Zap some useless patches

(in preparation for cmake-2.8.11)
2013-05-30 08:34:32 +00:00
dcoppa
35dcd7ca8d Fix for the problem sthen@ reported some time ago: if a library is
not listed in SHARED_LIBS, it will be created with no version suffix.

It was a regression caused by my "build shared libraries without
soname" work, sorry.
2013-05-13 15:02:26 +00:00
zhuk
a575bb848f Add support for rubyarchhdrdir and rubyarchlibdir, with fallback to "defaults"
on systems that have such directories but RbConfig doesn't have such options.

Needed for some minor KDE SC parts.

ok dcoppa@
2013-04-22 13:13:56 +00:00
dcoppa
ec9f3212ec Fix a couple of crashers, from upstream:
Bugfix: don't crash when a target is expected but is not available
(upstream git commit e767ffcda58ab73cf2c4394202eec7ae1f6035b5)

Bugfix: don't crash if the link.txt file contains empty lines
(upstream git commit 8ff1d4714fb7cd42eb3cd8db041b529e433eb7c8)
2013-01-18 22:17:06 +00:00
dcoppa
a4eecf1e1c Sync with upstream.
Thanks Amit Kulkarni and brad.king@kitware.com
2012-12-06 15:11:07 +00:00
dcoppa
3f852fbc8f Bugfix update to cmake-2.8.10.2.
Sync patches with what has been committed upstream (kudos to Amit)
2012-12-05 11:32:04 +00:00
dcoppa
9213ddc2b4 Sync with upstream
(http://cmake.org/gitweb?p=cmake.git;a=commit;h=94f37851ef5c6dccbe2dd647a3b38e3196393298)
2012-11-26 12:32:29 +00:00
dcoppa
9e78ddaf2d Append "/usr/X11R6/include" to ${QT_INCLUDES} to unbreak the build
in some circumstances (i.e. QtOpenGL not finding GL/gl.h)
2012-11-22 13:21:49 +00:00
dcoppa
ca0eb5212e Fix string literal typo (from upstream) 2012-11-15 12:29:07 +00:00
dcoppa
a056eca19b Update to cmake-2.8.10.1 (plus some fixes)
Thanks Vadim, landry@

OK landry@
2012-11-15 08:43:25 +00:00
dcoppa
c079d1f2bf Update to cmake-2.8.10.
Successfully gone through a bulk build.

Feedback landry@, Vadim Zhukov, Amit Kulkarni
Bulk build and OK landry@
2012-11-11 17:13:31 +00:00
dcoppa
8db1eb592e CMake now creates shared libraries without soname.
Tested in a bulk build by landry@
Feedback by nigel@ and landry@
OK landry@
2012-10-08 07:23:09 +00:00
dcoppa
d475b0a293 Update to cmake-2.8.9.
"There was no cmake fallout in the bulk on amd64" jasper@
Also tested by Brad with a handful of CMake using ports
2012-08-31 12:28:31 +00:00
dcoppa
367b2bd1b2 Garbage collect the pthread patching for CMake.
From Brad, thanks.
2012-08-20 08:07:34 +00:00
dcoppa
957583efb2 Fix the old FindLua51 module too. 2012-07-12 16:26:13 +00:00