Commit Graph

11732 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 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
KWSys Robot 34238d5bcb KWSys Nightly Date Stamp 2011-06-28 00:13:12 -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
KWSys Robot d9d7e8ffa5 KWSys Nightly Date Stamp 2011-06-21 00:13:02 -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 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
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
KWSys Robot 0751106f2f KWSys Nightly Date Stamp 2011-06-16 00:13:08 -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 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
KWSys Robot cf1c3c102f KWSys Nightly Date Stamp 2011-06-14 00:12:44 -04:00
KWSys Robot 46e3a6c9b9 KWSys Nightly Date Stamp 2011-06-13 00:12:06 -04:00
KWSys Robot 05610bf283 KWSys Nightly Date Stamp 2011-06-12 00:11:49 -04:00
KWSys Robot 6e74e36320 KWSys Nightly Date Stamp 2011-06-11 00:13:05 -04:00
Brad King a4ec24269b CTest: Report tests not run due to unknown configuration
When add_test(NAME) is called without the CONFIGURATIONS argument then
the test is intended to run in any configuration.  In multi-config
generators like the VS IDE and Xcode tests created by add_test(NAME) can
only be run when testing a known configuration (otherwise there is no
way to generate the test command line).  If no test command line is
known for a particular configuration, or if no configuration is given to
ctest, report the test as not run instead of silently skipping it.

Also fix CMake's own TestsWorkingDirectory test invocation to correct a
previously silent failure exposed by this change.
2011-06-10 09:52:18 -04:00
Brad King 77ddb6a0cd Use cascading-if for per-config test and install code
When generating per-config blocks in test and install scripts replace
the form

  IF()
    # config == A
  ENDIF()
  IF()
    # config == B
  ENDIF()

with

  IF()
    # config == A
  ELSEIF()
    # config == B
  ELSE()
    # no config matches
  ENDIF()

for clarity and to support the else() case cleanly.
2011-06-10 09:25:46 -04:00
KWSys Robot 778cf7e5e6 KWSys Nightly Date Stamp 2011-06-10 00:13:04 -04:00
KWSys Robot 9ccefd55c5 KWSys Nightly Date Stamp 2011-06-09 00:12:04 -04:00
Brad King 98dc13e513 Merge topic 'xcode-source_groups-folders-issue-10039'
f09ba0f Fix style errors added by parent and grandparent
eeeeca1 XCode: Support target folders on XCode.
59ed84e Xcode: Support multiple level nesting of XCode folders (#10039)
d0a403f CMake: Move tokenize to cmSystemTools
2011-06-08 15:44:44 -04:00
Brad King 45adc8e8c1 Merge topic 'fix_vs10_custom_command_rulefiles'
9d406cd Fix for bug #11927, external project git clone step always runs vs10.
2011-06-08 15:44:30 -04:00
Brad King b41ad3b399 Teach find_(library|package) about Linux multiarch (#12037)
Implement support for multiarch as specified here:

  http://wiki.debian.org/Multiarch
  https://wiki.ubuntu.com/MultiarchSpec

Detect the <arch> part of <prefix>/lib/<arch> from the implicit library
search path from each compiler to set CMAKE_<lang>_LIBRARY_ARCHITECTURE.
Define CMAKE_LIBRARY_ARCHITECTURE using one of these values (they should
all be the same).  Teach the find_library and find_package commands to
search <prefix>/lib/<arch> whenever they would search <prefix>/lib.
2011-06-08 10:04:44 -04:00
Brad King f09ba0f1a2 Fix style errors added by parent and grandparent 2011-06-08 07:54:33 -04:00
KWSys Robot 0f939ee164 KWSys Nightly Date Stamp 2011-06-08 00:13:16 -04:00
Brad King 313a633b85 Merge topic 'vs10_include_fix'
27aa446 One more try.  Use full path by default, and relative on broken compilers.
2dfc121 Use bin tree for inclues to avoid -I with spaces in the path.
6d29b4b Append and do not clobber CMAKE_CXX_FLAGS in the test.
7815e90 Fix for bug#10798.  VS10 did not append -I flags with COMPILE_FLAGS prop.
2011-06-07 14:04:00 -04:00
Brad King f0d3658102 Merge topic 'fix_leak'
dd52fc3 Fix a memory leak.
2011-06-07 14:03:56 -04:00
Brad King 33b3d10d6e Merge topic 'Xcode-universal-binary-depend-issue-11844'
44cdae9 Xcode: Fix parallel build depends with universal binaries (#11844)
2011-06-07 14:03:53 -04:00