Commit Graph

12392 Commits

Author SHA1 Message Date
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
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
KWSys Robot d03606a19c KWSys Nightly Date Stamp 2012-02-17 00:05:08 -05:00
KWSys Robot e2042b68d3 KWSys Nightly Date Stamp 2012-02-16 00:05:07 -05:00
KWSys Robot a8b5714935 KWSys Nightly Date Stamp 2012-02-15 00:05:04 -05:00
David Cole 4fd13c0f15 Merge topic 'FixFeatureSummaryForREQUIREDPackages'
e6c5b94 fix FeatureSummary for REQUIRED packages, they were reported as OPTIONAL
2012-02-14 16:17:07 -05:00
David Cole 4f9c114dfa Merge topic 'ImproveCPackDoc-reloaded'
d4b77eb Avoid discovering system infos for documentation. Adding some path is enough.
9002f73 Fix non existent std::string::clear on VS6
02ccb32 Create getDocumentedModulesListInDir which may be used in other context.
24fbc28 Add missing section markup for CPackComponent
bafd8a9 Example of builtin variable documentation (i.e. only used in C++ source code).
543f1ad Make the load of script documentation more efficient and dynamic.
cdbd1a9 Fix another compiler warning due to a typo
52c53de Really avoid compiler warning about unused vars
37f90ed Calm down compiler warning about unused var
7c82b7f Fix potential bad memory access, thanks to Eike
62b589b Suppress unused var, beautify code, avoid 1 extra newline.
751713f Update bash completion file in order to handle new CPack doc options.
1629615 CPack Documentation extraction from CMake script begins to work
83e34dd Implement simple CMake script comment markup language.
c6a0169 CPack begin the implementation of --help-command* and --help-variables*
2012-02-14 16:14:56 -05:00
David Cole 4f81c709d1 Merge topic 'CPackNSIS-fixIgnore-INCLUDE_TOPLEVEL'
6a74eb1 CPackNSIS fix #0012935 switch from LOG_WARNING to avoid final error.
2012-02-14 16:14:45 -05:00
David Cole e65f39a59e Merge topic 'interrupt-bug-12649'
131eed6 cmake-gui: Improve interrupt granularity to fix bug 12649.
2012-02-14 16:14:35 -05:00
Eric NOULARD d4b77eba17 Avoid discovering system infos for documentation. Adding some path is enough. 2012-02-14 16:05:24 -05:00
Eric NOULARD 9002f73f31 Fix non existent std::string::clear on VS6 2012-02-14 16:05:24 -05:00
Eric NOULARD 02ccb3291b Create getDocumentedModulesListInDir which may be used in other context.
This should makes it easier to use the same "documented module"
techniques for CTest, CMake or user module.
2012-02-14 16:05:23 -05:00
Eric NOULARD bafd8a9e79 Example of builtin variable documentation (i.e. only used in C++ source code). 2012-02-14 16:05:23 -05:00
Eric NOULARD 543f1adfa4 Make the load of script documentation more efficient and dynamic.
CPack help will be searched in any CPack*.cmake file located
near to CPack.cmake file. The script files is parsed iff
the first line begin with ##section. Moreover the documentation
section name is specified on the remaining part of the line
minus the space immediately following ##section.
2012-02-14 16:05:23 -05:00
Eric NOULARD cdbd1a9e39 Fix another compiler warning due to a typo 2012-02-14 16:05:23 -05:00
Eric NOULARD 52c53deb1b Really avoid compiler warning about unused vars 2012-02-14 16:05:23 -05:00
KWSys Robot 5b016a23d0 KWSys Nightly Date Stamp 2012-02-14 00:05:06 -05:00
KWSys Robot f17d3f58d6 KWSys Nightly Date Stamp 2012-02-13 00:05:08 -05:00
KWSys Robot 62952bc9b4 KWSys Nightly Date Stamp 2012-02-12 00:05:07 -05:00
Alex Neundorf e6c5b9452a fix FeatureSummary for REQUIRED packages, they were reported as OPTIONAL
Alex
2012-02-11 18:04:26 +01:00
KWSys Robot 677047dda0 KWSys Nightly Date Stamp 2012-02-11 00:05:07 -05:00
KWSys Robot 0fcf69d72f KWSys Nightly Date Stamp 2012-02-10 00:05:05 -05:00
KWSys Robot 16b1a6e4e0 KWSys Nightly Date Stamp 2012-02-09 00:05:06 -05:00
KWSys Robot 59ecc2c8ac KWSys Nightly Date Stamp 2012-02-08 00:05:06 -05:00
David Cole 3f359596a0 Merge topic 'fix-ccmake-clear'
415ffda ccmake: Extend clear line.
1dd43c4 ccmake: Factor clear line.
2012-02-07 15:35:58 -05:00
David Cole 2619d76556 Merge topic 'warn-funny-path-names'
c8ef643 Allow directory names containing '=' and warn if necessary (#12934)
2012-02-07 15:35:32 -05:00
David Cole 43b463cdfc Merge topic 'VS11-WinRT-project-issue-12930'
a03447b VS: Simplify ;-separated attribute value parsing
9e01aef VS: Add support for WinRT project properties (#12930)
2012-02-07 15:35:00 -05:00
David Cole a3e7913897 Merge topic 'AddTopLevelForComponent'
5d18851 CPackArchive restore default behavior and provide new variable.
3cab24a CPack  Add top level directory in component install for Archive Generators
2012-02-07 15:34:39 -05:00
David Cole 941d533cc3 Merge topic 'find-vcexpress'
de28946 Find VC Express during default generator selection (#12917)
2012-02-07 15:33:23 -05:00
KWSys Robot 45bba99538 KWSys Nightly Date Stamp 2012-02-07 00:05:07 -05:00
Nicolas Despres 415ffda7a8 ccmake: Extend clear line.
When configuring or generating the 'ng' of the end of the second line
is not cleared.  This patch fixes this.

The problem was introduced by commit fd632195 (ccmake: Align 'g' and 'q'
key instructions, 2011-01-07) which adjusted the length of lines that
need clearing.
2012-02-06 10:23:50 -05:00
Brad King c8ef6430e0 Allow directory names containing '=' and warn if necessary (#12934)
The approach taken by commit 8704525f (Reject directory names containing
'=', 2011-01-14) was perhaps too heavy-handed for avoiding the obscure
cases when '=' in the path fails due to limitations of Make syntax.
Only two CMake tests:

  LinkDirectory
  OutOfSource

fail when the path contains '=' and they cover obscure cases.  Instead
of rejecting such paths outright just warn when the problem may occur.
2012-02-06 09:40:42 -05:00
KWSys Robot e130d3ece4 KWSys Nightly Date Stamp 2012-02-06 00:05:09 -05:00
Nicolas Despres 1dd43c4c9d ccmake: Factor clear line. 2012-02-05 15:09:37 +01:00
Eric NOULARD 6a74eb1d36 CPackNSIS fix #0012935 switch from LOG_WARNING to avoid final error. 2012-02-05 13:13:48 +01:00
KWSys Robot 34cc537132 KWSys Nightly Date Stamp 2012-02-05 00:05:09 -05:00
KWSys Robot a1979dc0e9 KWSys Nightly Date Stamp 2012-02-04 00:05:06 -05:00
Brad King a03447b3df VS: Simplify ;-separated attribute value parsing
An implementation ;-separated list parsing was added by commit a1f976ce
(VS: Add support for three new project properties, 2011-11-23) and again
by commit 9e01aefd (VS: Add support for WinRT project properties,
2012-02-03).  Refactor both instances to use ExpandListArgument.
2012-02-03 14:35:35 -05:00
Eugene Golushkov 9e01aefd24 VS: Add support for WinRT project properties (#12930)
VS_WINRT_EXTENSIONS: Boolean property that correspond to "Enable
Tailored Features" in Visual Studio 11 IDE.

VS_WINRT_REFERENCES: Semicolon-delimited list of *.winmd references to
add to the project, which creates a new <ItemGroup>.
2012-02-03 09:26:24 -05:00
KWSys Robot 46a734cdbd KWSys Nightly Date Stamp 2012-02-03 00:05:06 -05:00
KWSys Robot e858440185 KWSys Nightly Date Stamp 2012-02-02 00:05:06 -05:00
Eric NOULARD 5d18851b25 CPackArchive restore default behavior and provide new variable.
CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY should be set by the user
in order to get the toplevel directory included in the archive
whenever a componentized archive is requested. This solves bug #12129
and keeps fully backward compatible behavior.
2012-02-01 23:32:50 +01:00
David Cole 46c7b7d85a Merge topic 'rpath-docs-whitespace'
33eee2c Add whitespace after '.' in CMAKE_SKIP_RPATH docs.
2012-02-01 14:51:47 -05:00
David Cole 3e0eeb9fc8 Merge topic 'imported-target-visibility'
f9c1c62 Add test covering imported target scope rules
ca39c5c Optionally allow IMPORTED targets to be globally visible
2012-02-01 14:49:10 -05:00
David Cole a7c5a6896e Merge topic 'doc-IMPORTED-properties'
7d20619 Clarify IMPORTED_ target property documentation
2012-02-01 14:46:36 -05:00
Peter Kuemmel de289462ef Find VC Express during default generator selection (#12917)
CMake doesn't find Visual C++ Express and uses "NMake Makefiles"
generator by default when one calls cmake WITHOUT using the -G options.
Teach CMake to find VC Express to use it as the default generator just
like the commercial versions.
2012-02-01 09:04:27 -05:00
KWSys Robot b2215bdb26 KWSys Nightly Date Stamp 2012-02-01 00:05:08 -05:00