15332 Commits

Author SHA1 Message Date
David Cole
a3edde36ad Merge topic 'avoid-busted-java-test-on-macs'
c8f3919 Avoid problem reading jni.h on Macs.
2010-10-28 14:10:48 -04:00
David Cole
3f3f3e5f54 Merge topic 'CPackDeb-MoreControl'
a749724 CPackDeb Added several optional debian binary package fields
2010-10-28 14:10:23 -04:00
David Cole
ec93cd2ead Merge topic 'fix-11173'
6e1282f ExternalProject: No svn --username if empty (#11173)
2010-10-28 14:10:01 -04:00
David Cole
5b43d8f8b1 Merge topic 'external-project-extra-gen'
beeca11 Fixed parallel build for generators with EXTRA.
2010-10-28 14:09:43 -04:00
David Cole
424ba550e5 Merge topic 'PythonLibs-2.7'
1f369a7 ENH: Added case for Python 2.7.
2010-10-28 14:09:17 -04:00
KWSys Robot
70101ee8e7 KWSys Nightly Date Stamp 2010-10-28 00:11:05 -04:00
KWSys Robot
01a90e9622 KWSys Nightly Date Stamp 2010-10-27 00:11:06 -04:00
KWSys Robot
7db02e9b3a KWSys Nightly Date Stamp 2010-10-26 00:11:04 -04:00
David Cole
c8f39193e0 Avoid problem reading jni.h on Macs.
Apple released an update recently in which there
was a broken symlink for jni.h that pointed to
a non-existent file. CMake had trouble configuring
because it encountered an error trying to read
jni.h.

We avoid the problem here by introducing a variable
CTEST_RUN_Java, which defaults to OFF on Macs, that
indicates whether to even attempt finding java, reading
jni.h and adding the "Java" CMake test.

If you would like to test Java on a Mac where the
jni.h symlink is not busted, feel free to pass in
-DCTEST_RUN_Java:BOOL=ON when configuring CMake.
2010-10-25 15:03:36 -04:00
Eric NOULARD
a749724029 CPackDeb Added several optional debian binary package fields
This fixes bugs #0011355  and 0008342.
The merged patch is a contribution from Michael Lasmanis and Petri Hodju
with some extra documentation added by the merger.
2010-10-25 20:40:45 +02:00
KWSys Robot
06b5eaa3cf KWSys Nightly Date Stamp 2010-10-25 00:11:05 -04:00
KWSys Robot
de81f2a4ee KWSys Nightly Date Stamp 2010-10-24 00:11:05 -04:00
KWSys Robot
185582d5fe KWSys Nightly Date Stamp 2010-10-23 00:12:04 -04:00
David Cole
6e1282f840 ExternalProject: No svn --username if empty (#11173)
Nor --password. But please do if non-empty. Thank you.
2010-10-22 16:23:27 -04:00
Marcus D. Hanwell
beeca11c9b Fixed parallel build for generators with EXTRA.
Fixed parallel build for projects using generators that have the
CMAKE_EXTRA_GENERATOR as well as CMAKE_GENERATOR. Thanks to Bill Hoffman
for helping me to track this one down, I missed parallel builds.
2010-10-22 11:16:21 -04:00
KWSys Robot
91b5bc3efa KWSys Nightly Date Stamp 2010-10-22 00:10:12 -04:00
KWSys Robot
e42160f3e0 KWSys Nightly Date Stamp 2010-10-21 00:11:02 -04:00
KWSys Robot
5bae7f3b19 KWSys Nightly Date Stamp 2010-10-20 00:11:01 -04:00
David Cole
9e6eb7c8b6 Merge topic 'xcode-hh-files'
8f0a70e Xcode: Recognize .hh as C++ (#11307)
2010-10-19 15:53:54 -04:00
David Cole
b0fb2ad3e1 Merge topic 'AddCMAKE_CURRENT_LIST_DIR'
b011840 Use absolute path to FindPackageHandleStandardArgs.cmake everywhere
41e4f1a Add automatic variable CMAKE_CURRENT_LIST_DIR(dir of CMAKE_CURRENT_LIST_FILE)
f9fc79c Remove trailing whitespace
2010-10-19 15:53:16 -04:00
Marcus D. Hanwell
1f369a71c8 ENH: Added case for Python 2.7. 2010-10-19 14:53:33 -04:00
KWSys Robot
915e5805d9 KWSys Nightly Date Stamp 2010-10-19 00:10:04 -04:00
KWSys Robot
00b327fed8 KWSys Nightly Date Stamp 2010-10-18 00:11:02 -04:00
KWSys Robot
76c8c6017c KWSys Nightly Date Stamp 2010-10-17 00:10:08 -04:00
KWSys Robot
0dc88cf853 KWSys Nightly Date Stamp 2010-10-16 00:10:08 -04:00
KWSys Robot
57c04db124 KWSys Nightly Date Stamp 2010-10-15 00:10:07 -04:00
KWSys Robot
3dc07529cf KWSys Nightly Date Stamp 2010-10-14 00:10:43 -04:00
KWSys Robot
68e0b6357d KWSys Nightly Date Stamp 2010-10-13 00:10:36 -04:00
David Cole
e2476232c0 Merge topic 'FindBoost_bugfix_cleanup'
b867a3f Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.
2010-10-12 11:12:16 -04:00
David Cole
e4508ac82f Merge topic 'FindHDF5-is-parallel'
3445532 FindHDF5: Fix typo in parallel-IO support check (#11291)
2010-10-12 11:12:00 -04:00
David Cole
0ecc8a409c Merge topic 'findmpi-msmpi-update'
35d2770 Update module to locate newely released MS MPI HPC Pack R2.
2010-10-12 11:11:47 -04:00
David Cole
fbecc534d1 Merge topic 'document-bundle-loader'
abb6e75 Document ENABLE_EXPORTS behavior on Mac (#11295)
2010-10-12 11:11:33 -04:00
David Cole
b14764c29c Merge topic 'qt4-imports-dir'
2dae2f1 Find imports dir in Qt 4.7
2010-10-12 11:08:51 -04:00
David Cole
77f045c57a Merge topic 'find-subversion-foreign-lang'
d2f8c5f FindSubversion: Use C locale to detect version (#11273)
42126aa FindSubversion: Fix for German localized client (#11273)
2010-10-12 11:06:41 -04:00
David Cole
1b98d04e1a Merge topic 'vs10-order-dependencies'
973df7c VS10: Order .vcxproj dependencies deterministically (#10502)
2010-10-12 11:05:57 -04:00
David Cole
f78f82ccbf Merge topic 'CodeBlocksGeneratorFixForExternalSubdirs'
9072535 CodeBlocks Generator: Do not omit files in the project file listing.
2010-10-12 11:04:53 -04:00
Brad King
8f0a70e5f0 Xcode: Recognize .hh as C++ (#11307) 2010-10-12 09:06:33 -04:00
KWSys Robot
3810da1a73 KWSys Nightly Date Stamp 2010-10-12 00:10:33 -04:00
Philip Lowman
b867a3f1a8 Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.
There is no need to introduce this extra variable as FindBoost
can simply rely on if Boost_USE_STATIC_RUNTIME is defined
or not to disable the old searching behavior for static runtime
libraries on WIN32.
2010-10-11 22:48:33 -04:00
Brad King
3445532652 FindHDF5: Fix typo in parallel-IO support check (#11291) 2010-10-11 09:35:46 -04:00
David Partyka
35d2770df9 Update module to locate newely released MS MPI HPC Pack R2. 2010-10-11 09:20:07 -04:00
Brad King
abb6e755eb Document ENABLE_EXPORTS behavior on Mac (#11295)
Mention that it is implemented with -bundle-loader on platforms that
need link-time symbol resolution but that do not use DLL import libs.
2010-10-11 08:35:19 -04:00
KWSys Robot
3138cc503b KWSys Nightly Date Stamp 2010-10-11 00:10:06 -04:00
KWSys Robot
c89527a421 KWSys Nightly Date Stamp 2010-10-10 00:10:08 -04:00
KWSys Robot
8af6a13728 KWSys Nightly Date Stamp 2010-10-09 00:10:06 -04:00
Clinton Stimpson
2dae2f1a0b Find imports dir in Qt 4.7 2010-10-08 20:55:55 -06:00
KWSys Robot
7119b5f5be KWSys Nightly Date Stamp 2010-10-08 00:10:06 -04:00
Rolf Eike Beer
d2f8c5f8ab FindSubversion: Use C locale to detect version (#11273)
Force LC_ALL to C before the call of the svn executable as it is done in
the Subversion_WC_INFO macro a few lines below.
2010-10-07 11:10:40 -04:00
Rolf Eike Beer
42126aaf6c FindSubversion: Fix for German localized client (#11273)
On a Win32 system with a German version of SilkSVN I couldn't run CMake
again on the working copy as the cache is displayed as corrupted. The
cause is that the regular expression to find the version number will not
match and put everything from the "svn --version" output into the cache,
which contains umlauts and other funny characters.

Fix the regexp to not only match " version " but also " Version " as
it's in the German output. I have no idea what will happen on a French
or Japanese system. This should be easy to test as it happens also on a
German Linux system.
2010-10-07 10:04:19 -04:00
Brad King
973df7c0e9 VS10: Order .vcxproj dependencies deterministically (#10502)
This avoids needless modification of the project files during
regeneration.
2010-10-07 09:54:24 -04:00