kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
18,391 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

12549 Commits

Author SHA1 Message Date
David Cole e4382180fc Merge topic 'add-const-qualifiers' 
737c49a Add 'const' qualifier to some cmCommand members
261491f cmPropertyDefinition::IsChained is const
 2012-03-02 11:50:07 -05:00
David Cole 1073d50508 Merge topic 'inject_code_via_variable' 
2557a08 Fix typo in error message, and remove redundent test.
9090572 Add ability to include a file in a project via a cache variable.
 2012-03-02 11:49:35 -05:00
David Cole 20446079ee Merge topic 'run-vim-spellcheck' 
43d6011 Run vim spellcheck on some files
 2012-03-02 11:49:23 -05:00
David Cole af87e8abb0 Merge topic 'dragndrop-sla' 
5663e43 DragNDrop: Fix problem with relocated files in Xcode 4.3
 2012-03-02 11:48:55 -05:00
David Cole 0ee7b8ea03 Merge topic 'find_package-improve-messages' 
eeaaffc find_package: Test error and warning messages in failure cases
52dffb9 Merge branch 'test-CMakeCommands' into find_package-improve-messages
d365104 find_package: Optionally warn when implicitly using Config mode
31ead5f find_package: Reject mixed use of MODULE- and CONFIG-only options
6d83083 find_package: mention requested version number in error message
9c39bbd find_package: add CONFIG mode keyword alias for NO_MODULE
f310f67 find_package: add MODULE mode to use only Find-modules
7d67dcf find_package: improve error message when no Find module is present
978d89b find_package: rename NoModule to UseFindModules
 2012-03-02 11:48:38 -05:00
David Cole 2fb1df42a2 Merge topic 'find_package-report-CONFIGS-error' 
b3f9fe4 find_package: print error if an invalid CONFIGS name is used
 2012-03-02 11:48:09 -05:00
David Cole 881dc35579 Merge topic 'factor-install-type' 
573fa3b Factor cmInstallType out of cmTarget::TargetType
 2012-03-02 11:47:42 -05:00
David Cole 6ed36e7b88 Merge topic 'simplify-GetRealDependency' 
4f6fd96 Drop if(...) check because condition is always true
 2012-03-02 11:47:21 -05:00
David Cole e8aa0401c8 Merge topic 'fix-BORLAND-doc-typo' 
a5edfc4 Fix typo in documentation
 2012-03-02 11:46:51 -05:00
David Cole c79a57b0ac Merge topic 'CPack-updateCommonDoc' 
6ad0f04 Update CPackConfig template.
94a2693 Review and update CPack variable documentation.
 2012-03-02 11:46:23 -05:00
David Cole aba1c1aa3b Merge topic 'fix-macos-findprogramm-crash' 
0d2f5c8 Fix crash if app bundle executeable couldn't be found
 2012-03-02 11:45:48 -05:00
KWSys Robot 65dfe9e5be KWSys Nightly Date Stamp 2012-03-02 00:05:05 -05:00
Rolf Eike Beer f605b92dec improve error message on a stray "endwhile()" 2012-03-01 21:20:48 +01:00
Brad King 09ff226e4c Merge branch 'add-const-qualifiers' into doxygen-fixes 
Conflicts:
	Source/cmPropertyDefinition.h
 2012-03-01 10:40:21 -05:00
KWSys Robot 3d8028841d KWSys Nightly Date Stamp 2012-03-01 00:05:06 -05:00
Bill Hoffman 2557a08054 Fix typo in error message, and remove redundent test. 2012-02-29 22:28:06 -05:00
Yury G. Kudryashov 31ab25c0c9 doxygen: MathCommand is not about string operators 2012-03-01 02:33:13 +04:00
Yury G. Kudryashov 486033aef3 doxygen: review cmake.h 
* Move top-level comment to class apidocs
* Remove misleading comment
 2012-03-01 02:33:13 +04:00
Yury G. Kudryashov 937bb4bebf doxygen: remove a few comments 
These comments were either wrong or non-informative.
Replace some of them by brief comments
 2012-03-01 02:33:13 +04:00
Yury G. Kudryashov 477459010f doxygen: fix some comments in cmPolicies.h 2012-03-01 02:33:12 +04:00
Yury G. Kudryashov 43d60114a5 Run vim spellcheck on some files 2012-02-29 14:07:50 -05:00
Yury G. Kudryashov 737c49a357 Add 'const' qualifier to some cmCommand members 
Use const_cast for the special case in cmFindBase where
GetFullDocumentation calls GenerateDocumentation.
 2012-02-29 13:27:04 -05:00
Clinton Stimpson 5663e436ab DragNDrop: Fix problem with relocated files in Xcode 4.3 
Remove dependency on /Developer/Headers/FlatCarbon when creating SLAs for DMG images.
Instead, of adding those .r files on the command line, include the necessary .r files
from the generated .r file.
 2012-02-29 08:29:46 -07:00
Yury G. Kudryashov 89403bf87f Rename UsedCommands to FinalPassCommands 
When I read 'UsedCommands' I thought that it holds all commands used in the
file, not only those that have FinalPass().
 2012-02-29 11:49:42 +04:00
KWSys Robot 4fd479816d KWSys Nightly Date Stamp 2012-02-29 00:05:04 -05:00
Yury G. Kudryashov 4a48be323b doxygen: Small fixes in cmake.h apidocs 2012-02-29 00:18:22 +04:00
Yury G. Kudryashov 1e5b971ed0 doxygen: Use proper syntax to document enum 2012-02-29 00:18:11 +04:00
Yury G. Kudryashov 54ab11c0d2 doxygen: Improve API docs of GetRealDependency 
Use list instead of sequence of sentences in one paragraph.
 2012-02-29 00:17:48 +04:00
Yury G. Kudryashov 80072d4ebf doxygen: cmPropertyDefinition 2012-02-29 00:17:37 +04:00
Brad King d3651041e9 find_package: Optionally warn when implicitly using Config mode 
Define variable CMAKE_FIND_PACKAGE_WARN_NO_MODULE for use by a project
that wants to use an explicit mode in every call to find_package in
order to generate more specific failure messages.  Word the warning
using the new CONFIG and MODULE mode keywords when the minimum required
version of CMake is new enough to have them.  Otherwise word the warning
using the old NO_MODULE mode keyword.

Inspired-by: Alex Neundorf <neundorf@kde.org>
 2012-02-28 10:01:44 -05:00
Brad King 31ead5f695 find_package: Reject mixed use of MODULE- and CONFIG-only options 
Many options imply exclusive Config mode.  The new MODULE option
implies exclusive Module mode.  Do not allow mixed combinations.
 2012-02-28 09:58:31 -05:00
Alex Neundorf 6d8308314a find_package: mention requested version number in error message 
When neither a Find-module or a config file can be found print the
required version so the user knows which version of the package to
install.
 2012-02-28 09:58:31 -05:00
Alex Neundorf 9c39bbd474 find_package: add CONFIG mode keyword alias for NO_MODULE 2012-02-28 09:58:31 -05:00
Alex Neundorf f310f67291 find_package: add MODULE mode to use only Find-modules 
The new mode differ from default mode in that that it doesn't fallback
to config mode.  The default mode stays unchanged.
 2012-02-28 09:58:01 -05:00
Alex Neundorf 7d67dcf52b find_package: improve error message when no Find module is present 
Explain exactly why CMake is looking for a package configuration file
and who is expected to provide what:

 CMake Error at CMakeLists.txt:7 (find_package):
  By not providing "Find<pkg>.cmake" in CMAKE_MODULE_PATH the caller
  has asked CMake to find a package configuration file provided by
  "<pkg>", but CMake did not find one.

  Could not find a package configuration file provided by "<pkg>"
  with any of the names:

    <pkg>Config.cmake
    <pkg>-config.cmake

  Add the installation prefix of "<pkg>" to CMAKE_PREFIX_PATH or
  set "<pkg>_DIR" to a directory containing one of the above files.
  If "<pkg>" provides separate development package or SDK be sure
  it has been installed.

The first paragraph explains how CMake is interpreting the intention of
the caller.  This puts the blame or credit at the call site in the
project code where it belongs both when it is a bug and when it is
intentional.  It can be dropped in NO_MODULE mode.

Suggested-by: Brad King <brad.king@kitware.com>
 2012-02-28 09:56:49 -05:00
KWSys Robot 26519d591e KWSys Nightly Date Stamp 2012-02-28 00:05:06 -05:00
Peter Collingbourne 7a6b5f4651 Ninja: Remove an unnecessary variable 2012-02-28 02:55:32 +00:00
Alex Neundorf 978d89b99d find_package: rename NoModule to UseFindModules 
...positive logic is easier to handle

Alex
 2012-02-27 16:36:29 -05:00
Alex Neundorf b3f9fe42f9 find_package: print error if an invalid CONFIGS name is used 
In commit 41c2895b (Added version support to Config mode of find_package
command, 2008-01-28) the error message was computed but was not
reported.  Add the SetError call to report it.
 2012-02-27 16:09:34 -05:00
Brad King 573fa3bf13 Factor cmInstallType out of cmTarget::TargetType 
The purpose of the TargetType enumeration was overloaded for install
type because install rules were once recorded as targets.  Factor the
install types out into their own enumeration.
 2012-02-27 13:19:57 -05:00
Yury G. Kudryashov 4f6fd961da Drop if(...) check because condition is always true 
GetLocation returns std::string::c_str() which is never NULL
 2012-02-27 11:59:15 -05:00
Yury G. Kudryashov a5edfc4fb7 Fix typo in documentation 2012-02-27 08:26:05 -05:00
KWSys Robot 00daeff02b KWSys Nightly Date Stamp 2012-02-27 00:05:06 -05:00
Peter Collingbourne 80ff2102a4 Ninja: Use cmSystemTools::ExpandListArgument to split compile/link commands 2012-02-27 04:05:38 +00:00
Peter Collingbourne d2731a376c Ninja: Add a missed license header 2012-02-27 02:41:00 +00:00
KWSys Robot 08ff8727af KWSys Nightly Date Stamp 2012-02-26 00:05:05 -05:00
Eric NOULARD 94a269304e Review and update CPack variable documentation. 
This concerns all variables common to all CPack generators.
Variables mainly used and/or set in CPack.cmake are documented
therein. C++ built-in variables are documented in
cmCPackDocumentVariables.cxx.
 2012-02-25 23:07:07 +01:00
Bjoern Ricks 0d2f5c8d6a Fix crash if app bundle executeable couldn't be found 
Fix a crash on Mac OS X if a programm can't be found as an
application bundle. CFRelease MUST NOT be called on a
NULL value.

See https://developer.apple.com/library/mac/documentation/CoreFOundation/Reference/CFTypeRef/Reference/reference.html#//apple_ref/doc/c_ref/CFRelease
 2012-02-25 18:20:36 +01:00
KWSys Robot f3fe73da54 KWSys Nightly Date Stamp 2012-02-25 00:05:05 -05:00
Yury G. Kudryashov 261491fe17 cmPropertyDefinition::IsChained is const 2012-02-24 23:37:02 +04:00
KWSys Robot 2437b40933 KWSys Nightly Date Stamp 2012-02-24 00:05:06 -05:00
David Cole d662dff769 Fix shadowed variable warning on dashboard results 2012-02-23 08:11:09 -05:00
KWSys Robot e8e964f675 KWSys Nightly Date Stamp 2012-02-23 00:05:06 -05:00
David Cole f66e735de3 Fix compiler warning reported on older Borland dashboard. 
Avoid assignment inside the if.
 2012-02-22 17:12:11 -05:00
David Cole d90eed445f Fix compiler error reported on older Borland dashboard. 
Declare variable only once at a scope appropriate for both uses.
 2012-02-22 16:40:30 -05:00
David Cole eabc9b0bc5 Ninja: CMake: Adapt Ninja generator for per-target include dirs 
The confluence of the ninja-generator and target-include-directories
branches conspired to produce a nice little compiler error when
they were both merged into 'next'...

Yay for Continuous dashboards!
 2012-02-22 16:31:00 -05:00
David Cole bada88e8e4 Merge branch 'target-include-directories' into ninja-generator 2012-02-22 16:21:48 -05:00
David Cole 8233636dbe Update the documentation regarding INCLUDE_DIRECTORIES. 
It is now a target property and is affected by the use
of the include_directories command.
 2012-02-22 15:22:03 -05:00
David Cole d899eb71b5 Call ExpandVariablesInString for each target's INCLUDE_DIRECTORIES 
For strict backwards compatibility only. This should be unnecessary at
this point, but introducing a policy to deprecate it properly is a
whole different topic branch...
 2012-02-22 07:29:32 -05:00
David Cole c21db870a5 Make search paths ordered and unique 
Avoid duplicates. Same as before the introduction of the INCLUDE_DIRECTORIES
target property.
 2012-02-22 07:29:32 -05:00
David Cole 22021f07f8 Remove cmMakefile::GetIncludeDirectories 
After making the changes to use the new target level INCLUDE_DIRECTORIES
property, there are no more callers of this method.
 2012-02-22 07:29:32 -05:00
Stephen Kelly 9106b564ae Extract and use the INCLUDE_DIRECTORIES target properties. 
Eliminate callers of cmMakefile::GetIncludeDirectories.

All callers of GetIncludeDirectories should go through the local generator
object.

Only the local generator calls cmTarget::GetIncludeDirectories directly.
 2012-02-22 06:31:50 -05:00
Stephen Kelly 840509babb Keep the INCLUDE_DIRECTORIES target property up to date. 
The directory level property changes need to be added to it.
 2012-02-22 06:31:50 -05:00
Stephen Kelly a4d5f7b9b2 Add API to get the ordered includes for a target. 2012-02-22 06:31:49 -05:00
David Cole 8adaee2b0b CMake: Eliminate cmMakefile::IncludeDirectories 
Instead, re-implement it in terms of the directory property INCLUDE_DIRECTORIES.
 2012-02-22 06:31:49 -05:00
Stephen Kelly 7620932d82 Remove include flags memoization. 2012-02-22 06:31:49 -05:00
Stephen Kelly 97a5faa858 Make it safe to call this method without creating duplicates. 2012-02-22 06:31:49 -05:00
Stephen Kelly edd5303949 Refactor GetIncludeFlags to take includes instead of fetching them 2012-02-22 06:31:49 -05:00
KWSys Robot 6a1c5a3569 KWSys Nightly Date Stamp 2012-02-22 00:05:07 -05:00
David Cole 8ef15df700 Merge topic 'HandleTargetsInCMakeRequiredLibraries' 
35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES
61cb4ea bootstrap: move while() and endwhile() into the bootstrap build
c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being built
628f365 -remove trailing whitespace
 2012-02-21 15:58:27 -05:00
David Cole 7d02020d68 Merge topic 'CPack-dynamicDocSection' 
9a8103e Try to fix compile error on Win32-vs70
4da2223 Fix typo in end markup
cfac874 More documentation concerning CPack Components
dee0a38 Put CPack DMG and PackageMaker doc in separate files
b4abcfe Correct copy/paste section name mistake
9717727 Suppress unecessary (now empty) doc sections
7a8f44a Add structure documentation for CPack Bundle generator
b8a274c Add structured documentation for NSIS
a6bce55 Dynamically add documentation section specified in documented script.
 2012-02-21 15:57:17 -05:00
David Cole 8a665fa363 Merge topic 'findlibrary-versioned-libraries' 
70f3623 Find_library(): allow searching for versioned shared objects
 2012-02-21 15:56:26 -05:00
David Cole 751e492840 Merge topic 'fix-typos-12975' 
7ec2ebd fix the same typos as found by Debian in other places, too
d36d29f various typo and formatting fixes in manual pages (#12975)
 2012-02-21 15:56:13 -05:00
David Cole 7bcd282981 Merge topic 'try-compile-random-name' 
4fbdce2 try_compile: Use random executable file name (#12957)
 2012-02-21 15:54:51 -05:00
David Cole cee42a73e8 Merge topic 'honor-gcov-empty-coverage' 
58d75e2 CTest: mark all gcov covered files as covered
 2012-02-21 15:54:09 -05:00
David Cole e1a6c9b9a1 Merge topic 'link-OpenBSD-shared-libs-issue-12954' 
afc75bb Recognize OpenBSD versioned .so names (#12954)
 2012-02-21 15:53:41 -05:00
Alex Neundorf 61cb4ea72e bootstrap: move while() and endwhile() into the bootstrap build 
Alex
 2012-02-21 15:33:40 -05:00
Alex Neundorf 628f365140 -remove trailing whitespace 
Alex
 2012-02-21 15:33:31 -05:00
Peter Kuemmel 54bd175eea Ninja: windows msvc: create for each target a .pdb file 2012-02-21 21:18:05 +01:00
David Cole df19b9cadb VS6: Avoid _MBCS define when _SBCS is defined (#12189) 
Should fix the failing SBCS test on the VS6 dashboard.
 2012-02-21 11:29:06 -05:00
KWSys Robot cffebe643c KWSys Nightly Date Stamp 2012-02-21 00:05:05 -05:00
KWSys Robot dc4c24ac79 KWSys Nightly Date Stamp 2012-02-20 00:05:06 -05:00
Peter Collingbourne a1a30340a2 Ninja: Import library support for Windows 2012-02-19 23:20:03 +00:00
Peter Kuemmel 21997cea4d Ninja: mark the Windows specific hacks with a comment only 2012-02-19 19:21:05 +01:00
Peter Kuemmel 3b84741515 Ninja: disable unfinished Windows ninja support 
This way the branch is ready-to-merge, even when the generator is broken on Windows.
 2012-02-19 19:15:57 +01:00
Peter Kuemmel adb54f3dbf Ninja: add some hacks for Windows 2012-02-19 11:30:07 +01:00
Peter Kuemmel 895914881b Ninja: also build ninja support on Windows 2012-02-19 11:10:18 +01:00
Peter Collingbourne 70c39c845f Ninja: Shell encode the command used in custom commands 2012-02-19 05:57:22 +00:00
Peter Collingbourne 0643fee2fe Ninja: Shell encode various CMake invocations 2012-02-19 05:57:22 +00:00
Peter Collingbourne 43b1d8bad0 Ninja: Shell encode paths used in "cd" commands 2012-02-19 05:43:47 +00:00
KWSys Robot e316cbbbc3 KWSys Nightly Date Stamp 2012-02-19 00:05:09 -05:00
Peter Collingbourne cea03e632b Ninja: Backslash rules for Windows 
Generally these are only required in build statements, as Ninja wants
to be able to chop paths up.  But it doesn't hurt to also try to use
them in command line arguments.
 2012-02-19 04:00:02 +00:00
Eric NOULARD 9a8103e929 Try to fix compile error on Win32-vs70 2012-02-19 00:01:39 +01:00
Eric NOULARD 9717727d5f Suppress unecessary (now empty) doc sections 2012-02-18 22:30:57 +01:00
Eric NOULARD a6bce55aef Dynamically add documentation section specified in documented script. 
Modify CPackDeb and CPackRPM as an example
 2012-02-18 22:07:39 +01:00
Peter Collingbourne 9362440a0b Ninja: Identifier encoding rules for ' ' and ':' 2012-02-18 20:33:39 +00:00
Peter Collingbourne 99856d537c Ninja: Partially revert "win fixes: escape back slash/colon, use cd. as cmd.exe nop" 
It introduced encoding rules in the wrong place, and broke the
CustomCommand test case.

This reverts commit 7fb2bb3e8b.
 2012-02-18 20:33:33 +00:00
Rolf Eike Beer 70f362305f Find_library(): allow searching for versioned shared objects 
This did not work because find_library() did only treat the given name as
complete filename if is matched "PREFIX.*SUFFIX":

find_library(MYLIB libfoo.so.2)

Now it is also taken as a whole if the name matches "PREFIX.*SUFFIX\..*".
 2012-02-18 16:19:29 +01:00
Modestas Vainius d36d29f1f0 various typo and formatting fixes in manual pages (#12975) 
The patch fixes the following lintian warnings:

W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakemodules.1.gz 2728: warning: macro `..' not defined
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz overriden overridden
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz explicitely explicitly
I: cmake-data: spelling-error-in-manpage usr/share/man/man1/cmakemodules.1.gz jave java
W: cmake-data: manpage-has-errors-from-man usr/share/man/man1/cmakeprops.1.gz 1040: warning [p 25, 3.7i]: can't break line
W: cmake: manpage-has-errors-from-man usr/share/man/man1/cmake.1.gz 4233: warning [p 85, 1.3i]: can't break line
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz overriden overridden
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz explicitely explicitly
I: cmake: spelling-error-in-manpage usr/share/man/man1/cmake.1.gz jave java
 2012-02-18 16:12:45 +01:00
Peter Kuemmel 7fb2bb3e8b Ninja: win fixes: escape back slash/colon, use cd. as cmd.exe nop 2012-02-18 08:15:23 +01:00