Commit Graph

16703 Commits

Author SHA1 Message Date
Alex Neundorf
d3ae0fff7d Improve documentation for --find-package mode
Alex
2011-08-11 22:43:45 +02:00
Alex Neundorf
bf07375264 Add a cmake.m4 for using cmake in autoconf projects instead of pkgconfig
This file has been written today from scratch by Matthias Kretz
and it BSD-licensed.

Alex
2011-08-11 22:43:33 +02:00
Alex Neundorf
b0e357824c Use the file-utility to test for 64bit if there is no /usr/lib64
Alex
2011-08-09 16:32:45 +02:00
Alex Neundorf
53edfb206b Better support for lib64 and Debian multiarch
If CMAKE_SIZEOF_VOID_P is not set from the outside, it checks for the
existance of /usr/lib64, and if it exists, SIZEOF_VOID_P is set to 8.

For multiarch, if this is debian and
CMAKE_${LANGUAGE}_LANGUAGE_ARCHITECTURE has not been set, it globs
for the files in /lib, and uses the first one which matches
CMAKE_LIBRARY_ARCHITECTURE_REGEX.

Alex
2011-08-09 16:32:45 +02:00
Alex Neundorf
b8fdaa1d66 Fix copyright notice in new CMakeFindPackageMode.cmake
Alex
2011-08-09 16:32:45 +02:00
Alex Neundorf
7690edffd9 Replace cmake::GetScriptMode() with GetWorkingMode()
GetWorkingMode() returns a new enum WorkingMode, which is one of
NORMAL_MODE, SCRIPT_MODE and FIND_PACKAGE_MODE.

Alex
2011-08-09 16:32:45 +02:00
Alex Neundorf
e4f603b698 Implement find-package mode of cmake
In find-package mode, cmake executes Modules/CMakeFindPackage.cmake,
which calls find_package(), and this is then evaluated in cmake.cxx,
which prints an appropriate message to stdout, so it can be used
e.g. in a normal Makefile:

$ /opt/cmake-HEAD/bin/cmake --find-package -DNAME=JPEG
 -DCOMPILER_ID=GNU -DLANGUAGE=C -DMODE=EXIST
JPEG found.
$ /opt/cmake-HEAD/bin/cmake --find-package -DNAME=JPEG
 -DCOMPILER_ID=GNU -DLANGUAGE=C -DMODE=COMPILE

$ /opt/cmake-HEAD/bin/cmake --find-package -DNAME=JPEG
 -DCOMPILER_ID=GNU -DLANGUAGE=C -DMODE=LINK
-rdynamic -ljpeg

Alex
2011-07-02 23:14:28 +02:00
Alex Neundorf
a91d662f46 Add find-package mode, which does nothing yet
-add command line argument --find-package and handle it,
 i.e. call an empty function cmake::FindPackage()
-add basic help

Alex
2011-07-02 17:50:05 +02:00
Alex Neundorf
b976e70063 Make clLocalGenerator::GetTargetFlags() public
This will later on be used for getting the link flags

Alex
2011-07-02 17:08:34 +02:00
KWSys Robot
fe9ac70076 KWSys Nightly Date Stamp 2011-07-02 00:13:02 -04:00
KWSys Robot
5a022c3339 KWSys Nightly Date Stamp 2011-07-01 00:13:04 -04:00
KWSys Robot
f9b69873a9 KWSys Nightly Date Stamp 2011-06-30 00:13:06 -04:00
KWSys Robot
e1237478f1 KWSys Nightly Date Stamp 2011-06-29 00:12:05 -04:00
Brad King
d2430b2ffd Merge topic 'revert-fixbug_0004147'
fc04531 Revert "Add a new function SWIG_GET_WRAPPER_DEPENDENCIES to UseSWIG.cmake"
2011-06-28 16:27:06 -04:00
KWSys Robot
34238d5bcb KWSys Nightly Date Stamp 2011-06-28 00:13:12 -04:00
Brad King
fc045318f8 Revert "Add a new function SWIG_GET_WRAPPER_DEPENDENCIES to UseSWIG.cmake"
This reverts commit 1088b0278e.

Wrapper dependency scanning (fix for #4147) does not work at CMake
configuration time if an input file is provided by a custom command
(regression #12307).  Revert to original behavior until a solution is
found.
2011-06-27 13:36:01 -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
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
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