Commit Graph

56 Commits

Author SHA1 Message Date
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
dcoppa
806c7f2749 Fix typo: "_CXX_" -> "_C_"
(upstream git commit b9ccaf5f7977b7444a50a7b1dbb1902422f7ab27)
2012-07-03 07:48:54 +00:00
dcoppa
d595a0834d Fix mandir path when using GNUInstallDirs.cmake: on OpenBSD it's
$prefix/man, not $prefix/share/man. While here, fix infodir too.

Pointed out by sthen@
Ok landry@, sthen@
2012-06-27 19:28:39 +00:00
dcoppa
d013c2ba21 Sync FindIconv, FindLCMS, FindLibintl modules with KDE's upstream git
Add FindLibLZMA module
(upstream git commit ee26019bd433020b8aad3c3a70bcb537e03b04ba)

Bugfix: FindPythonLibs: honor EXACT version specification
(upstream git commit 9d145b0998f21ae6d0571c5b6a7ab0168722df7c)

Bugfix: UseJava: fix find_jar() called with multiple files
(upstream git commit 5593d5718ec90f6a2e37ca4e2fdf3fc4537380ff)
2012-06-15 10:26:56 +00:00
dcoppa
cf153cacfa Fix libpthread linking (use '-pthread' instead of '-lpthread') for
cmake-based ports that use "CHECK_LIBRARY_EXISTS(pthread ...)".

Fix libpthread linking for devel/llvm too (additional care was
needed).

No fallout in a bulk build: thanks landry!
2012-06-14 09:32:00 +00:00
dcoppa
ae2b2f4867 Sync with what bentley@ pushed upstream. 2012-05-15 08:36:28 +00:00
bentley
77cf8307a0 Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM.
This prevents compiler errors with cmake/wxwidgets:
"error: template with C linkage"

See the variable's comments and links in
/usr/local/share/cmake/Modules/FindwxWidgets.cmake for more information.

ok dcoppa@ (MAINTAINER)
2012-05-14 19:24:33 +00:00
dcoppa
7defea07ff try_compile: Cleanup temporary directories
Since commit 4fbdce2b (try_compile: Use random executable file name,
2012-02-13) a different <target>.dir is used for each try-compile.
Cleanup the directories as well as their content to avoid accumulating
leftover temporary directories.
(upstream git commit 953257ca611526c9a161a22e5148802be1c67649)

Remove troublesome "Qt4Deploy" and "CTest.UpdateCVS" tests
(from gentoo's package/dev-util/cmake/files/)

Sync FindPkgConfig.cmake patch with upstream
2012-05-07 13:58:18 +00:00
dcoppa
498b61a3b2 Update to cmake-2.8.8
OK sthen@
2012-05-07 07:06:20 +00:00
dcoppa
8903ff6939 Some fixes from upstream git:
fixes for Modules/FindRuby.cmake

fix wrong use of IS_ABSOLUTE into Modules/GenerateExportHeader.cmake

fix Source/cmLocalUnixMakefileGenerator3.cxx: exit the loop when
we have determined the language
2012-01-12 13:14:33 +00:00
dcoppa
0b7f7a5fee Update to cmake-2.8.7.
Tested in a bulk build by naddy@
2012-01-07 22:14:51 +00:00
dcoppa
395d06caab FindRuby.cmake: use RbConfig::CONFIG instead of obsolete and
deprecated Config::CONFIG.

pointed out by Amit Kulkarni and jeremy@
2011-12-03 13:38:43 +00:00
dcoppa
57eaee2ae8 Update to cmake-2.8.6
Fixed FindRuby.cmake module (from Vadim Zhukov)

Fixed FindJava.cmake and FindJNI.cmake modules when cmake is used
outside of our ports tree (problem reported and fix tested by
pirofti@)

Still "100% tests passed, 0 tests failed out of 197".

No fallout in a bulk build.

OK jasper@
2011-10-14 17:22:10 +00:00
dcoppa
d89de7a682 Update to cmake-2.8.5
Went in a bulk without issues, ok landry@
2011-09-20 11:32:36 +00:00
sthen
350530262b Switch to simpler Modules/CMakeDetermineSystem.cmake patch now committed
upstream. Suggested by/ok dcoppa@
2011-05-02 15:59:43 +00:00
sthen
49167b523a Set CMAKE_HOST_SYSTEM_PROCESSOR more like people are expecting by
using arch -s instead of uname -p. Tested with all current CMake
users in tree, no change.  ok dcoppa@
2011-04-29 16:50:32 +00:00
sthen
11ebbb999f Don't try to create directories which already exist, this significantly
cleans up the console output if you set USE_SYSTRACE.  ok dcoppa@
2011-04-16 15:18:13 +00:00
dcoppa
4cd9f900fc Update to cmake-2.8.4.
Tested in a bulk build by landry@.
Lot of feedback from various people on ports@: thanks!

OK landry@, sthen@
2011-03-13 18:23:01 +00:00
dcoppa
cc31bf9207 It's better having iconv and intl as QtCore dependencies.
This is my last commit for this, I promise.
2010-11-22 22:27:02 +00:00
dcoppa
6738b0f177 Sync with KDE upstream 2010-11-22 16:26:30 +00:00
dcoppa
8b27d047f3 Just removing that check makes more sense. I'm a moron. 2010-11-19 16:18:12 +00:00
dcoppa
a54b3f6002 Fix a bug that broke $QT_QT*_LIB_DEPENDENCIES since cmake-2.8.2.
Now port-lib-depends-check for geo/qgis is happy.

Problem noticed by, and OK landry@
2010-11-19 11:10:35 +00:00
dcoppa
195d9f90cf Update to cmake-2.8.3
OK sthen@, landry@ (who also tested this in a bulk build)
2010-11-15 11:39:08 +00:00
dcoppa
2c6d0109b6 Zap some unwanted optimization flags ("-O3", "-Os") that were brought
in by cmake when the CMAKE_BUILD_TYPE var is used.

Pointed out by and OK steven@
2010-10-26 18:31:18 +00:00
dcoppa
90d59a716c We overwrite library version numbers using our LIBxxx_VERSION
environment variable, but we want to do it for shared libraries
only. Otherwise a static library gets created as
libfoo.a.${LIBfoo_VERSION}, which is wrong.
Bug reported and patch tested by Alexandr Shadchin <alexandr DOT
shadchin AT gmail DOT com>: thanks!

While here, reword/clarify some comments to better explain what my
patches do.
2010-07-28 20:34:22 +00:00
dcoppa
7283a0afb2 Fix a bug with shared libraries having OUTPUT_NAME in their target
properties.

Update to cmake-2.8.2.

While here, move to new-style LIB_DEPENDS/WANTLIB.

OK espie@, landry@, sthen@
2010-07-12 19:19:30 +00:00
dcoppa
2151e979b2 Set CFLAGS in the ports Makefile instead of using handrolled patches.
Unbreak build on hppa too. From landry@: thanks!

OK landry@
2010-06-11 08:07:17 +00:00
dcoppa
23e0e99b42 Add some bits needed by kde4.
Move the "cleaning commands" from post-build to post-install.
From espie@: thanks!

OK espie@
2010-05-31 06:29:27 +00:00
dcoppa
8b1b17cff8 Update to cmake 2.8.1 (I also take maintainership).
"This is good, commit." espie@
2010-05-28 20:21:48 +00:00
dcoppa
49e2a1d89e Fix for Fortran shared libraries that were generated without
versioning.

OK ajacoutot@, landry@
2010-04-22 16:10:11 +00:00
dcoppa
64ab3526bf Avoid creating .so symlinks for shared libraries, as they break
OpenBSD porting standards.

OK landry@, sthen@
"if it works and other people like it, go ahead" espie@
2010-04-15 20:30:47 +00:00
landry
2dc0befd53 Force the use of -pthread in FindThreads.cmake module. It was looking
for -lpthread first.
No fallouts in a bulk build done by jasper@, thanks!
ok jasper@
2009-09-10 13:54:47 +00:00
espie
5155b8d081 deal with qt4 issues here, instead of in kde. 2008-02-04 22:31:20 +00:00
espie
41cf57d3f6 minor update to 2.4.8 (all tests pass now) 2008-01-26 21:26:32 +00:00
espie
34826115a4 minor update cmake 2.4.7 2007-08-25 08:35:20 +00:00
ajacoutot
b53948be18 - when cmake uses gcc to build things, make it correctly grab CFLAGS and
CXXFLAGS variables and don't force compiler optimizations

ok espie@
2007-06-18 11:52:26 +00:00
espie
12c720e6cc only call mkdir on !empty stuff that does not exist.
removes systrace warnings. reported by ajacoutout.
2007-06-16 13:01:37 +00:00
espie
e640d83dda allow cmake to proceed in color unless you `explicitly' ask it otherwise
(setting BATCH, for instance).

Synch FindQt4 with some of qt 4.3.0 stuff. Need to be fully synched with
qt 4.3.0 anyways...
2007-06-09 09:09:44 +00:00
espie
3782e1cd3d list -pthread as a dependency of qt4core, so that stuff will link in a simpler
way.
2007-04-25 14:56:13 +00:00