David Cole
8d7884c84a
Merge branch 'release'
2011-06-27 06:56:42 -04:00
KWSys Robot
ea1a519a35
KWSys Nightly Date Stamp
2011-06-27 00:10:06 -04:00
KWSys Robot
11b4eb2b8a
KWSys Nightly Date Stamp
2011-06-26 00:10:07 -04:00
KWSys Robot
428cfb8dcb
KWSys Nightly Date Stamp
2011-06-25 00:12:04 -04:00
Brad King
4ccf44bcb2
Merge topic 'use_devenv_forvs2010'
...
8555c2b
Look for VCExpress as a possible build tool as well as devenv.
ed0075b
Use relative paths for custom command inputs.
38368d5
Revert "With very long file names, VS 2010 was unable to compile files."
8cd66dc
Use devenv instead of msbuild for vs2010.
2011-06-24 17:32:03 -04:00
KWSys Robot
26607e9ae3
KWSys Nightly Date Stamp
2011-06-24 00:12:38 -04:00
Bill Hoffman
8555c2b4b7
Look for VCExpress as a possible build tool as well as devenv.
2011-06-23 15:29:25 -04:00
KWSys Robot
672b6ca5e4
KWSys Nightly Date Stamp
2011-06-23 00:12:34 -04:00
Bill Hoffman
ed0075bdb7
Use relative paths for custom command inputs.
...
For source files we use full paths. This allows for longer directory
names with VS2010. However, the use of full paths causes the GUI
to not display the custom commands.
2011-06-22 11:52:15 -04:00
KWSys Robot
d0d5540dc6
KWSys Nightly Date Stamp
2011-06-22 00:12:04 -04:00
Bill Hoffman
38368d52f3
Revert "With very long file names, VS 2010 was unable to compile files."
...
This reverts commit 945f2c2214
.
2011-06-21 16:00:31 -04:00
Bill Hoffman
8cd66dc0d2
Use devenv instead of msbuild for vs2010.
2011-06-21 15:58:11 -04:00
David Cole
e8e1048c5f
CMake 2.8.5-rc3
2011-06-21 13:05:02 -04:00
David Cole
4da6bea9e2
Merge branch 'release'
2011-06-21 11:59:34 -04:00
KWSys Robot
d9d7e8ffa5
KWSys Nightly Date Stamp
2011-06-21 00:13:02 -04:00
Brad King
e85df15b7d
Merge topic 'libarchive-install-copyright-notice'
...
d39aee4
libarchive: Install COPYING with CMake documentation
2011-06-20 15:14:19 -04:00
Brad King
ddd6e8ed55
Merge topic 'FindJNI-Fedora-issue-12276'
...
93fc629
FindJNI: Search in Fedora arch-specific JVM location (#12276 )
2011-06-20 15:14:07 -04:00
Brad King
26c449d1d9
Merge topic '11279_vs10sp1_and_improvements'
...
effb6bb
Detect VS 2010 SP1, faster and more robust detection
2011-06-20 15:13:57 -04:00
Brad King
2822bd184d
Merge topic 'doc-spelling-formatting-issue-12287'
...
d66459b
Documentation: Fix spelling / formatting errors (#12287 )
2011-06-20 15:13:37 -04:00
Brad King
25b0b777f6
Merge topic 'FindBoost_bugfixes_060911'
...
974374a
FindBoost: Also search for 1.46.1
f26d1cf
FindBoost: Fixes #12188
2011-06-20 15:13:25 -04:00
Brad King
146a7aee62
Merge topic 'find_library-lib64-issue-12247+12248'
...
3ba1713
find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248)
2011-06-20 15:13:19 -04:00
Brad King
2ae5a43fa7
Merge topic 'FindSWIG-find_program-NAMES-issue-12280'
...
03809b1
FindSWIG: Use NAMES in find_program directives (#12280 )
2011-06-20 15:12:55 -04:00
Brad King
d39aee483e
libarchive: Install COPYING with CMake documentation
2011-06-20 09:54:08 -04:00
KWSys Robot
5c668b821f
KWSys Nightly Date Stamp
2011-06-20 00:13:19 -04:00
Brad King
73d593033f
KWSys: Recognize color TERM=screen-256color-bce ( #12287 )
...
Author: Davide Mancusi <arekfu@gmail.com>
Acked-By: Modestas Vainius <modax@debian.org>
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627853
2011-06-19 18:17:07 -04:00
Modestas Vainius
d66459be8b
Documentation: Fix spelling / formatting errors ( #12287 )
...
The patch fixes the following problems spotted by lintian:
W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2641: warning [p 39, 1.5i]: can't break line
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakeprops.1.gz explict explicit
I: cmake: spelling-error-in-binary usr/bin/cmake explict explicit
I: cmake: spelling-error-in-binary usr/bin/cpack explict explicit
I: cmake: spelling-error-in-binary usr/bin/ctest explict explicit
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 7300: warning [p 120, 3.3i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explict explicit
I: cmake-curses-gui: spelling-error-in-binary usr/bin/ccmake explict explicit
I: cmake-qt-gui: spelling-error-in-binary usr/bin/cmake-gui explict explicit
2011-06-19 18:08:05 -04:00
KWSys Robot
ac8a6bf085
KWSys Nightly Date Stamp
2011-06-19 00:13:03 -04:00
KWSys Robot
e5fe580fcc
KWSys Nightly Date Stamp
2011-06-18 00:12:05 -04:00
KWSys Robot
594681d2c4
KWSys Nightly Date Stamp
2011-06-17 00:12:26 -04:00
Julien Malik
03809b1442
FindSWIG: Use NAMES in find_program directives ( #12280 )
...
Without this, regular swig (not 2.0) executable is not found
automatically.
Commit 55b7c87e
(Add support for new swig 2.0 application, 2011-03-28)
added support for finding swig 2.0 at the (accidental) expense of not
finding 1.x. Fix this regression.
2011-06-16 16:10:16 -04:00
KWSys Robot
0751106f2f
KWSys Nightly Date Stamp
2011-06-16 00:13:08 -04:00
Christoph Höger
93fc629adc
FindJNI: Search in Fedora arch-specific JVM location ( #12276 )
2011-06-15 13:18:14 -04:00
David Cole
34cfc880b1
CMake 2.8.5-rc2
2011-06-15 09:15:54 -04:00
David Cole
c962b67893
Merge branch 'release'
2011-06-15 09:09:59 -04:00
Philip Lowman
effb6bbfd7
Detect VS 2010 SP1, faster and more robust detection
...
Patch from Aaron C. Meadows
Adds support for detecting VS 2010 SP1
Also improves performance using CMAKE_CXX_COMPILER if it is available
and for robustness falls back using try_compile() and try_run()
2011-06-15 08:33:40 -04:00
Brad King
3ba1713f6f
find_library: Use lib->lib64 conversion in CXX-only projects (#12247,#12248)
...
Do not require the C language to be enabled to do lib->lib64 conversion.
The check was originally added by commit a5825cd1
(check in new find
stuff, 2006-03-02) to ensure that CMAKE_SIZEOF_VOID_P is set. Since
commit 3fdf1411
(FIND_LIBRARY should not require CMAKE_SIZEOF_VOID_P,
2008-02-11) the code following the check does not fail when the variable
is not set, so just remove the original check. This allows conversion
for any language that is enabled so long as the address size is known.
Reported-by: Christoph Höger <choeger@cs.tu-berlin.de>
2011-06-15 08:32:22 -04:00
KWSys Robot
a666810643
KWSys Nightly Date Stamp
2011-06-15 00:13:09 -04:00
Brad King
cc746a6eb7
Merge topic 'library-multiarch-issue-12037'
...
1ed19bc
multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD
52a6ed2
Test find_package multiarch support (#12037 )
b41ad3b
Teach find_(library|package) about Linux multiarch (#12037 )
2011-06-14 13:23:51 -04:00
Brad King
9c569bea2d
Merge topic '10997_PROTOBDUF_GENERATE_CPP_returns_wrong_path'
...
3982603
10997: PROTOBUF_GENERATE_CPP now supports proto files outside current dir
2011-06-14 13:23:43 -04:00
Brad King
414c35ebb2
Merge topic 'qt4-import-targets-mac'
...
e7f05d9
Add imported targets support for frameworks on Mac.
2011-06-14 13:23:37 -04:00
Brad King
a652af77ce
Merge topic 'qt4-useqt-module-deps'
...
5f983d1
Qt4: complete module dependencies in UseQt4.cmake
2011-06-14 13:23:33 -04:00
Brad King
0373e08f15
Merge topic 'gnu-isystem-flag-issue-12258'
...
33f5a83
GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value (#12258 )
2011-06-14 13:23:28 -04:00
Brad King
be555a042e
Merge topic 'ImproveCPackRPMdoc'
...
2af80c7
Add some more Specs file tag handling.
05720c7
CPackRPM: Enhance documentation
2011-06-14 13:23:24 -04:00
Brad King
f616f263cd
Merge topic 'ctest-no-config-report-notrun'
...
a4ec242
CTest: Report tests not run due to unknown configuration
77ddb6a
Use cascading-if for per-config test and install code
2011-06-14 13:23:20 -04:00
Philip Lowman
3982603c65
10997: PROTOBUF_GENERATE_CPP now supports proto files outside current dir
2011-06-14 09:25:16 -04:00
KWSys Robot
cf1c3c102f
KWSys Nightly Date Stamp
2011-06-14 00:12:44 -04:00
Clinton Stimpson
5f983d1706
Qt4: complete module dependencies in UseQt4.cmake
2011-06-13 17:37:26 -06:00
Clinton Stimpson
e7f05d9759
Add imported targets support for frameworks on Mac.
2011-06-13 17:21:41 -06:00
Brad King
33f5a83a5d
GNU: Fix CMAKE_INCLUDE_SYSTEM_FLAG_<lang> value ( #12258 )
...
Fix typo introduced by commit e28c16b4
(Split GNU compiler information
files, 2009-12-02).
Reported-by: Campbell Barton <ideasman42@gmail.com>
Suggested-by: Michael Hertling <mhertling@online.de>
2011-06-13 17:54:36 -04:00
Modestas Vainius
1ed19bcb25
multiarch: Set CMAKE_LIBRARY_ARCHITECTURE_REGEX for Linux|Hurd|kFreeBSD
...
* Fix linux CMAKE_LIBRARY_ARCHITECTURE_REGEX to support armel-linux-gnueabi.
* Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on kFreeBSD.
* Add CMAKE_LIBRARY_ARCHITECTURE_REGEX on GNU (Hurd).
Also regex is improved to support quadlets. Even if I have not seen this
in the wild yet, reportedly they are possible.
2011-06-13 11:12:23 -04:00