Commit Graph

12570 Commits

Author SHA1 Message Date
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
KWSys Robot bfbb575086 KWSys Nightly Date Stamp 2012-02-18 00:05:12 -05:00
Bill Hoffman 9090572f5c Add ability to include a file in a project via a cache variable.
If a variable exists called CMAKE_PROJECT_<projectName>_INCLUDE,
the file pointed to by that variable will be included as the last step
of the project command.
2012-02-17 12:41:39 -05:00
Aaron C. Meadows ba89e92ba6 Visual Studio: Allow setting Single Byte Character Set (#12189)
For Visual Studio using the Preprocessor Define _SBCS. This behavior
is similar to the way that _UNICODE and _MBCS work already.

Added tests to confirm this behavior.
2012-02-17 11:30:23 -05:00
KWSys Robot d03606a19c KWSys Nightly Date Stamp 2012-02-17 00:05:08 -05:00
Brad King 4fbdce2b79 try_compile: Use random executable file name (#12957)
Append a random number to the "cmTryCompileExec" file name to avoid
rapid creation and deletion of the same executable file name.  Some
filesystems lock executable files when they are created and cause
subsequent try-compile tests to fail arbitrarily.  Use a different
name each time to avoid conflict.
2012-02-16 10:13:50 -05:00
KWSys Robot e2042b68d3 KWSys Nightly Date Stamp 2012-02-16 00:05:07 -05:00
Rolf Eike Beer 58d75e22ae CTest: mark all gcov covered files as covered
Even if there are no lines covered in the file the gcov coverage report still
contains valueable information, the amount of uncovered lines and which exactly
they are. Set 'Covered="true"' for files we have a gcov report for even if they
have no lines covered. Otherwise CDash will neither show the uncovered line
count nor the detailed coverage report for this file.

When CTEST_EXTRA_COVERAGE_GLOB was used to collect otherwise uncovered files
'Covered="true"' was unconditionally set, so this can't be worse here.
2012-02-15 21:45:30 +01: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
Brad King afc75bb7f5 Recognize OpenBSD versioned .so names (#12954)
OpenBSD shared library names end in a ".#.#" version number suffix.
Teach cmComputeLinkInformation to tolerate the extra suffix after
the normal library name suffixes when parsing library names.
2012-02-13 10:34:41 -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
Peter Collingbourne 5d19e8aa6a Ninja: Appease various compilers 2012-02-05 01:48:08 +00:00
Peter Collingbourne bfe56f6802 Ninja: Remove some default arguments 2012-02-05 01:48:01 +00:00
Peter Collingbourne 69984906ef Ninja: Fix a 79-col violation 2012-02-05 00:57:22 +00: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
Peter Collingbourne 6dd410c2b9 Ninja: Add the Ninja generator 2012-02-02 23:40:21 +00:00
Peter Collingbourne 4468edf12b Add executable with exports flag support to cmLocalGenerator::GetTargetFlags 2012-02-02 23:36:42 +00:00
Peter Collingbourne 2cd36550b0 Add cmSystemTools::TrimWhitespace function 2012-02-02 23:04:38 +00: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
Eric NOULARD 37f90ed576 Calm down compiler warning about unused var 2012-01-31 22:45:07 +01:00
Eric NOULARD 7c82b7f51a Fix potential bad memory access, thanks to Eike 2012-01-31 22:44:58 +01:00
KWSys Robot 7ac717c079 KWSys Nightly Date Stamp 2012-01-31 00:05:06 -05:00
Stephen Kelly 33eee2c36f Add whitespace after '.' in CMAKE_SKIP_RPATH docs. 2012-01-31 01:46:34 +01:00
KWSys Robot ba4a9f726d KWSys Nightly Date Stamp 2012-01-30 00:05:08 -05:00
KWSys Robot 7f2b3a591e KWSys Nightly Date Stamp 2012-01-29 00:05:07 -05:00
KWSys Robot e2bb4dae20 KWSys Nightly Date Stamp 2012-01-28 00:05:21 -05:00
KWSys Robot 2184cc6469 KWSys Nightly Date Stamp 2012-01-27 00:05:07 -05:00
KWSys Robot 208569f1da KWSys Nightly Date Stamp 2012-01-26 00:05:05 -05:00
Brad King 7d20619fbe Clarify IMPORTED_ target property documentation
These properties are meant to be set to tell CMake something, not read
to get information from CMake.
2012-01-25 16:26:40 -05:00
Brad King ca39c5cdd1 Optionally allow IMPORTED targets to be globally visible
Consider the case motivating commit e01cce28 (Allow add_dependencies()
on imported targets, 2010-11-19).  An imported target references a file
generated at build time by a custom target on which it depends.  Had the
file been built directly using add_library or add_executable its target
name would have been visible globally.  Therefore the imported target
representing the file should be globally visible also.

Teach the IMPORTED signature of add_(executable|library) to accept a new
"GLOBAL" option to make the imported target visible globally.
2012-01-25 14:42:31 -05:00
David Cole 30620e7477 Merge topic 'uninitialized-var-in-if'
54fd9e3 fix uninitialized var in if(NOT foo bar STREQUAL "foo bar")
2012-01-25 11:17:46 -05:00
David Cole cef75ca909 Merge topic 'install-command-cleanup'
982b5d9 cmInstallCommand: Fix line length for style
a64b618 cmInstallCommand: Remove duplicated sentence from docs
01ddef8 cmInstallCommand: Fix indentation error
2012-01-25 11:15:03 -05:00
KWSys Robot 31c53c288c KWSys Nightly Date Stamp 2012-01-25 00:05:06 -05:00
Eric NOULARD 62b589b4cd Suppress unused var, beautify code, avoid 1 extra newline.
There remains extra newlines in text Formatter output
but the parser does not seem to be the culprit.
The formatter should be.
2012-01-24 23:38:22 +01:00
KWSys Robot 99180a0bb2 KWSys Nightly Date Stamp 2012-01-24 00:05:16 -05:00
KWSys Robot 86c9604f98 KWSys Nightly Date Stamp 2012-01-23 00:05:11 -05:00
Eric NOULARD 1629615a10 CPack Documentation extraction from CMake script begins to work
- Enhance extract doc parser. Seems robust now. The legacy
   module documentation parser works as before ignoring
   the new markup.

 - Proof of concept for CPack (generic), CPack RPM and CPack Deb
   generator for macro and variables.
   Try cpack --help-command and cpack --help-variables
2012-01-22 13:31:24 +01:00
Rolf Eike Beer 54fd9e38bb fix uninitialized var in if(NOT foo bar STREQUAL "foo bar")
Also adds test to verify this.
2012-01-22 12:15:57 +01:00
Eric NOULARD 83e34dd9e6 Implement simple CMake script comment markup language.
The language is very simple. It use ##<keyword> special comment
which opens a structured documentation block and ##end closes it.
This may be used to extract documentation for macro as 'command'
and 'variables' such that cpack --help-command and --help-variable
does parse builtin modules files (CPack.cmake, CPackComponent.cmake,
...) in order to extract the corresponding doc.
2012-01-22 11:44:05 +01:00
Eric NOULARD c6a0169442 CPack begin the implementation of --help-command* and --help-variables*
This modifications set tries to keep the unified doc for cmake/ctest/cpack
while introducing tool specific documentation separated.
Some documentation sections for CMake do not fit well to CPack.
2012-01-22 11:42:49 +01:00
KWSys Robot 3be1282fd3 KWSys Nightly Date Stamp 2012-01-22 00:05:05 -05:00
KWSys Robot a668c9f059 KWSys Nightly Date Stamp 2012-01-21 00:05:04 -05:00
KWSys Robot b8ff1c1e72 KWSys Nightly Date Stamp 2012-01-20 00:05:03 -05:00
KWSys Robot f2baff920e KWSys Nightly Date Stamp 2012-01-19 00:05:08 -05:00
KWSys Robot b2838626dd KWSys Nightly Date Stamp 2012-01-18 00:05:03 -05:00
David Cole 05fbfd494e Merge topic 'link-shared-depend-cycle-issue-12647'
8e756d2 Tolerate cycles in shared library link interfaces (#12647)
2012-01-17 16:25:19 -05:00
David Cole a6bc62c5ac Merge topic 'fixSymlinkInZIP'
768cf91 Do not add the content of a file if it's a symlink.
2012-01-17 16:23:38 -05:00
David Cole 4dd47eb6c3 Merge topic 'compiler-version'
0df1942 Detect SGI MIPSpro compiler version with its id
a5e892c Document compiler version macro formats used for detection
d7c6f41 Detect HP compiler version with its id
3dd9fa9 Detect SunPro compiler version with its id
c198730 Detect Watcom compiler version with its id
5899b98 Detect Clang compiler version with its id
b8cfa65 Detect PGI compiler version with its id
6dae666 Detect IBM XL compiler version with its id
4080d55 Detect Borland compiler version with its id
2cc205a Detect Intel compiler version with its id (#11937)
a6d83cc Detect MSVC compiler version with its id
a662855 Detect GNU compiler version with its id (#6251)
fa7141f Add framework to detect compiler version with its id (#12408)
2012-01-17 16:22:53 -05:00
David Cole 48f159f871 Merge topic 'vs10-fix-pdbname-issue-12328'
655a7dd VS10: Fix /pdb option vcxproj element name (#12328)
2012-01-17 16:22:10 -05:00
Brad King 982b5d9eef cmInstallCommand: Fix line length for style
After indentation was fixed by a previous commit some lines became too
long.  Re-wrap to shorten them.
2012-01-17 14:03:45 -05:00
Yury G. Kudryashov a64b6185de cmInstallCommand: Remove duplicated sentence from docs
install(TARGETS ...) documentation described twice what happens on non-DLL
systems.
2012-01-17 10:02:13 -05:00
Yury G. Kudryashov 01ddef87e6 cmInstallCommand: Fix indentation error
A large block of code was indented 2 spaces less than it should.
2012-01-17 10:02:02 -05:00
KWSys Robot 795221775a KWSys Nightly Date Stamp 2012-01-17 00:05:03 -05:00
KWSys Robot 038ba372fa KWSys Nightly Date Stamp 2012-01-16 00:05:04 -05:00
KWSys Robot 9188dafac1 KWSys Nightly Date Stamp 2012-01-15 00:05:03 -05:00
KWSys Robot c121f3f5c4 KWSys Nightly Date Stamp 2012-01-14 00:05:03 -05:00
Daniel Nelson 3cab24a974 CPack Add top level directory in component install for Archive Generators
This patch fixes bug #0012129
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
2012-01-13 22:01:53 +01:00
Brad King 8e756d2b9b Tolerate cycles in shared library link interfaces (#12647)
Since commit 183b9509 (Follow all dependencies of shared library private
dependencies, 2011-12-14) we honor LINK_INTERFACE_LIBRARIES when
following dependent shared libraries.  The link interface properties may
form a cycle if set incorrectly by a project.  Furthermore, the property
LINK_DEPENDENT_LIBRARIES may form a cycle if set incorrectly by hand
(though CMake should never generate one).  In either case, do not follow
the cycle forever when following the dependent shared library closure.
We only need to add dependency edges to the constraint graph once.

Add "LinkInterfaceLoop" test to cover this case.
2012-01-13 14:22:24 -05:00
Eric NOULARD 768cf91831 Do not add the content of a file if it's a symlink.
This wasn't necessary for TAR-like (TGZ, TBZ2, etc...) archive
because for those the size was 0. Either there is an error in
upstream libarchive concerning the size or we should not rely
on size of the entry for adding content.
2012-01-13 13:48:14 -05:00
KWSys Robot 50edbf0f22 KWSys Nightly Date Stamp 2012-01-13 00:05:04 -05:00
KWSys Robot c89ee4a10f KWSys Nightly Date Stamp 2012-01-12 00:05:10 -05:00
KWSys Robot bbed901178 KWSys Nightly Date Stamp 2012-01-11 00:05:34 -05:00
KWSys Robot 0020fc4517 KWSys Nightly Date Stamp 2012-01-10 00:05:04 -05:00
Brad King 655a7dd1d4 VS10: Fix /pdb option vcxproj element name (#12328)
The compiler tool uses "ProgramDataBaseFileName" but the linker tool
uses just "ProgramDataBaseFile".  Fix the generator accordingly.
2012-01-09 14:54:45 -05:00
David Cole 9362400d20 Merge topic 'early-exit-loop'
c959725 Exit the loop when we have determined the language.
2012-01-09 14:10:36 -05:00
David Cole 95b701b82a Merge topic 'fix-docs-typo'
9bffb3f Fix typos arguement -> argument.
2012-01-09 14:10:27 -05:00
David Cole 5a5c32e1f2 Merge topic 'update-libarchive'
6c611c6 libarchive: Restore CMake 2.6.3 as minimum version
2f5b677 libarchive: Update README-CMake.txt for new snapshot
156cb3b Merge branch 'libarchive-upstream' into update-libarchive
fd42bf1 libarchive: Set .gitattributes to allow trailing whitespace
4f4fe6e libarchive 3.0.2-r4051 (reduced)
65b6e19 libarchive: Avoid bogus conversion warning from PGI compiler
9ccaeb1 libarchive: Suppress PathScale compiler warnings
2309438 libarchive: Rename isoent_rr_move_dir parameter isoent => curent
b6ca96e libarchive: Include linux/types.h before linux/fiemap.h
f293b73 libarchive: Define _XOPEN_SOURCE=500 on HP-UX
6781a09 libarchive: Cleanup after ZLIB_WINAPI check
f15d757 libarchive: Remove hard-coded build configuration
3a9f449 libarchive: Use Apple copyfile.h API only if available
6af6b96 libarchive: Do not use MNT_NOATIME if not defined
02d5e40 libarchive: Check for 'struct statvfs' member 'f_iosize'
8b7ee30 libarchive: Do not use ST_NOATIME if not defined
...
2012-01-09 14:10:01 -05:00
David Cole 04b6f00bcf Merge topic 'ImproveCPackDoc-part1'
d2c9626 Document undocumented (but existing) cpack options (fix #0010134)
2012-01-09 14:09:50 -05:00
KWSys Robot 99a9205b4b KWSys Nightly Date Stamp 2012-01-09 00:05:03 -05:00
Stephen Kelly c9597259ea Exit the loop when we have determined the language. 2012-01-08 15:41:05 +01:00
Stephen Kelly 9bffb3fcf4 Fix typos arguement -> argument. 2012-01-08 15:32:51 +01:00
KWSys Robot e0d1e7e085 KWSys Nightly Date Stamp 2012-01-08 00:05:09 -05:00
KWSys Robot cad7508615 KWSys Nightly Date Stamp 2012-01-07 00:05:06 -05:00
KWSys Robot 2858f3433a KWSys Nightly Date Stamp 2012-01-06 00:05:03 -05:00
KWSys Robot a823d88149 KWSys Nightly Date Stamp 2012-01-05 00:05:03 -05:00
KWSys Robot d6f59a5293 KWSys Nightly Date Stamp 2012-01-04 00:05:09 -05:00
Eric NOULARD d2c9626d5a Document undocumented (but existing) cpack options (fix #0010134) 2012-01-03 16:47:35 +01:00
KWSys Robot df224727cf KWSys Nightly Date Stamp 2012-01-03 00:05:08 -05:00
Clinton Stimpson 131eed6607 cmake-gui: Improve interrupt granularity to fix bug 12649.
Instead of enabling interrupt only when a progress or message callback is called, add a new callback specifically for
interrupt.  This new callback is called from GetFatalErrorOccured() so cmake-gui can immediately report interrupt status
instead of calling queuing a call to cmSystemTools::SetFatalErrorOccured() and waiting for the progress or message
callback to be called to process that queued call.
2012-01-02 11:07:43 -07:00
KWSys Robot 40aedcbbae KWSys Nightly Date Stamp 2012-01-02 00:05:04 -05:00
KWSys Robot 7ce47e6908 KWSys Nightly Date Stamp 2012-01-01 00:05:04 -05:00
KWSys Robot 3a29d37b16 KWSys Nightly Date Stamp 2011-12-31 00:05:04 -05:00
KWSys Robot add4ad1098 KWSys Nightly Date Stamp 2011-12-30 00:05:04 -05:00
KWSys Robot 15cebeb047 KWSys Nightly Date Stamp 2011-12-29 00:05:05 -05:00
KWSys Robot 38bc4b5d9e KWSys Nightly Date Stamp 2011-12-28 00:05:03 -05:00
KWSys Robot 11385ba56a KWSys Nightly Date Stamp 2011-12-27 00:05:04 -05:00
KWSys Robot 6eb0779dbe KWSys Nightly Date Stamp 2011-12-26 00:05:03 -05:00
KWSys Robot 087b8feee4 KWSys Nightly Date Stamp 2011-12-25 00:05:03 -05:00
KWSys Robot 4fe0206e92 KWSys Nightly Date Stamp 2011-12-24 00:05:04 -05:00
KWSys Robot 9fc5faceea KWSys Nightly Date Stamp 2011-12-23 00:05:05 -05:00
Brad King ffdb37a4f7 Handle libarchive API change in archive_read_data_block
The offset argument type depends on the libarchive version.
2011-12-22 10:52:03 -05:00
KWSys Robot b81ef0533c KWSys Nightly Date Stamp 2011-12-22 00:05:19 -05:00
KWSys Robot b4c2f40653 KWSys Nightly Date Stamp 2011-12-21 00:05:03 -05:00
David Cole cc9319e717 Merge topic 'AddIncludePathForASMToDirectoryInformationFile'
ea68837 fix #12262: dependency scanning for ASM files
2011-12-20 14:21:52 -05:00
David Cole 7ca69a08cb Merge topic 'AddCommentToCDependencyScanner'
318b0cd Add comment about one more problem of the C depency scanner.
4bb08e0 Remove trailing whitespace
2011-12-20 14:21:43 -05:00
David Cole d6a33f6d38 Merge topic 'fix_double_project_cmake_build'
5badf5f Fix the case where cmake --build failed with two project cmds in one file.
2011-12-20 14:21:06 -05:00
David Cole 16dacf3a6a Merge topic 'AutomocFineTuning'
e474dcb automoc: improved warning message in relaxed mode
96fc5d5 automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODE
2011-12-20 14:20:32 -05:00
Bill Hoffman 5badf5f734 Fix the case where cmake --build failed with two project cmds in one file.
This adds a test that uses two project commands in the same CMakeLists.txt
file.  It also adds a fix so that cmake --build will work in that case.
The fix sets the name of the last project command in the top level
CMakeLists.txt in the cache variable CMAKE_PROJECT_NAME.  This variable
is used by cmake --build to find the project name.
2011-12-20 14:16:25 -05:00
KWSys Robot 4e98500012 KWSys Nightly Date Stamp 2011-12-20 00:05:03 -05:00
KWSys Robot 4bb3edfcb4 KWSys Nightly Date Stamp 2011-12-19 00:05:03 -05:00
Alex Neundorf ea6883752b fix #12262: dependency scanning for ASM files
Now also CMAKE_ASM_INCLUDE_PATH is written into
CMakeDirectoryInformation.cmake, which is necessary to make
the dependency scanning for included files work.

Alex
2011-12-18 19:15:34 +01:00
Alex Neundorf 318b0cdf23 Add comment about one more problem of the C depency scanner.
Alex
2011-12-18 15:44:33 +01:00
Alex Neundorf 4bb08e0a9b Remove trailing whitespace
Alex
2011-12-18 15:42:48 +01:00
KWSys Robot 84094cd155 KWSys Nightly Date Stamp 2011-12-18 00:05:03 -05:00
KWSys Robot 61da11ecd7 KWSys Nightly Date Stamp 2011-12-17 00:05:11 -05:00
David Cole ef086b5e41 Merge topic 'qtdialog-quit'
56e0499 QtDialog: Set Ctrl+Q as the shortcut for quitting the program.
2011-12-16 10:15:39 -05:00
David Cole 1706a7ed5b Merge topic 'intel-error-regex-issue-12627'
56f29f4 CTest: Recognize Intel errors without space before colon (#12627)
2011-12-16 10:15:35 -05:00
David Cole 44b6b0b5df Merge topic 'remove-old-QtDialog-readme'
470bcfa Remove the apparently outdated README in Source/QtDialog.
2011-12-16 10:15:28 -05:00
David Cole 65db5b4a99 Merge topic 'osx-dependent-libraries'
5d99343 Do not link private dependent shared libraries on OS X > 10.4
2011-12-16 10:15:07 -05:00
David Cole 2f82798ef8 Merge topic 'transitive-shared-lib-depend'
183b950 Follow all dependencies of shared library private dependencies
2011-12-16 10:15:01 -05:00
David Cole be637d7a92 Merge topic 'fix-12441-show-custom-target-progress'
7ab1162 CMake: Fix progress reporting for custom targets (#12441)
2011-12-16 10:14:52 -05:00
David Cole 037616f194 Merge topic 'vs-version-ivar'
6571f46 Fix Intel Fortran .vfproj files for VS 10
2011-12-16 10:14:25 -05:00
David Cole 765e9d30ae Merge topic 'ctest-no-cdash-issue-12618'
52f937a CTest: Do not get CDash version without drop site (#12618)
2011-12-16 10:13:12 -05:00
David Cole f189c5d7d3 Merge topic 'xcode-rerun-issue-12616'
e8b8f0e Xcode: Create separate rerun dependencies for subprojects (#12616)
2011-12-16 10:12:36 -05:00
KWSys Robot b15071791c KWSys Nightly Date Stamp 2011-12-16 00:05:04 -05:00
Brad King c544545c63 KWSys: Correctly handle empty environment variables
Fix a crash which occurs when SystemTools::GetPath attempts to process
an empty environment variable.

Author: Vladimir Panteleev <vladimir@thecybershadow.net>
2011-12-15 15:45:09 -05:00
Raphael Kubo da Costa 56e0499104 QtDialog: Set Ctrl+Q as the shortcut for quitting the program.
QKeySequence::Quit does not work on all platforms, and since it
translates to Ctrl+Q on all platforms where it does work, Ctrl+Q was
hardcoded instead.
2011-12-15 08:51:50 -07:00
Brad King 56f29f48c2 CTest: Recognize Intel errors without space before colon (#12627)
Fix the regex meant to match errors of the form:

 C:\some\dir\source.cpp(17): catastrophic error: could not open source file "some_header.h"

to make the space between ')' and ':' optional.
2011-12-15 09:31:12 -05:00
Raphael Kubo da Costa 470bcfad7b Remove the apparently outdated README in Source/QtDialog.
Qt has been LGPL-licensed for a few years, so the clause mentioning only
developers with a paid Qt license can change the code seems to be
outdated.
2011-12-15 08:42:38 -05:00
Brad King 5d9934312d Do not link private dependent shared libraries on OS X > 10.4
The default OS X 10.4 linker incorrectly searches for dependencies of
linked shared libraries only under the -isysroot location.  It fails to
find dependencies of linked shared libraries in cases such as the
ExportImport test.  It produces errors like:

 /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: warning can't open dynamic library:
 libtestLib3Imp.dylib
 referenced from: /.../ExportImport/Root/lib/libtestLib3lib.1.2.dylib
 (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
 /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: Undefined symbols: _testLib3Imp
 referenced from libtestLib3lib expected to be defined in
 libtestLib3Imp.dylib

or with CMAKE_SKIP_RPATH off to enable install_name in the Export side:

 /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: warning can't open dynamic library:
 /Developer/SDKs/MacOSX10.4u.sdk/.../ExportImport/Export/impl/libtestLib3Imp.dylib
 referenced from: /.../ExportImport/Export/libtestLib3lib.1.2.dylib
 (checking for undefined symbols may be affected) (No such file or directory, errno = 2)
 /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: Undefined symbols:_testLib3Imp
 referenced from libtestLib3lib expected to be defined in
 /.../ExportImport/Export/impl/libtestLib3Imp.dylib

Note how "/Developer/SDKs/MacOSX10.4u.sdk" is prepended to the dependent
library path.

Commit 2cff26fa (Support linking to shared libs with dependent libs,
2008-01-31) and commit 82fcaebe (Pass dependent library search path to
linker on some platforms, 2008-02-01) worked around the problem by
defining platform variable CMAKE_LINK_DEPENDENT_LIBRARY_FILES.  It tells
CMake to link to dependent libraries explicitly by their path thus
telling the linker where to find them.

Unfortunately the workaround had the side effect of linking dependent
libraries and defeats most benefits of LINK_INTERFACE_LIBRARIES.
Fortunately OS X 10.5 and above do not need to find transitive
dependencies at all so we can avoid the workaround on Modern OS X.
2011-12-15 08:14:30 -05:00
KWSys Robot 0a6543d957 KWSys Nightly Date Stamp 2011-12-15 00:05:09 -05:00
Alex Neundorf e474dcb231 automoc: improved warning message in relaxed mode
Alex
2011-12-14 19:12:15 +01:00
Brad King 183b95098e Follow all dependencies of shared library private dependencies
In cmComputeLinkDepends we compute the transitive closure of private
shared library dependencies.  When a shared library is added to this
closure we must follow all of its dependencies whether they are private
or public.  Previously we only followed the private dependencies.  Fix
the implementation to follow the public dependencies too.  Also extend
the ExportImport test to cover this case.
2011-12-14 11:33:01 -05:00
KWSys Robot 4ed1769186 KWSys Nightly Date Stamp 2011-12-14 00:05:05 -05:00
Johan Fänge 7ab1162eaa CMake: Fix progress reporting for custom targets (#12441)
Adds "include progress.make" to build.make, just like for
add_executable and add_library targets. The code was copied
from cmMakefileTargetGenerator::WriteCommonCodeRules().
2011-12-13 20:06:27 -05:00
Brad King 6571f4655a Fix Intel Fortran .vfproj files for VS 10
Commit 1be4b6f4 (Order VS local generator Version ivar values
consistently, 2011-11-10) fixed the Version ivar of the VS 10 local
generator by setting it correctly to 10 instead of leaving it at 7.
This broke generation of .vfproj files for the Intel Fortran plugin to
VS 10 by mixing VS 9 and 10 formats together in one file.  Teach the
local generator to pretend the Version is 9 for Intel Fortran targets.
2011-12-13 16:35:35 -05:00
Alex Neundorf 96fc5d5d07 automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODE
automoc now defaults to strict mode, also with Qt4, i.e. it behaves as
the documentation says by default. I also inverted the switch
CMAKE_AUTOMOC_STRICT_MODE to CMAKE_AUTOMOC_RELAXED_MODE.
Docs and test adapted accordingly.

Alex
2011-12-13 22:11:47 +01:00
KWSys Robot 3c101429a4 KWSys Nightly Date Stamp 2011-12-13 00:05:03 -05:00
Valat Sébastien 52f937aea8 CTest: Do not get CDash version without drop site (#12618)
Avoid sleep for 3 seconds in ctest if CDashDropSite is empty.
2011-12-12 09:35:09 -05:00
KWSys Robot 99771d55be KWSys Nightly Date Stamp 2011-12-12 00:05:04 -05:00
KWSys Robot 53455f938b KWSys Nightly Date Stamp 2011-12-11 00:05:05 -05:00
KWSys Robot 85344d767b KWSys Nightly Date Stamp 2011-12-10 00:05:04 -05:00
Brad King e8b8f0eda8 Xcode: Create separate rerun dependencies for subprojects (#12616)
Generate the rerun dependency file for the top-level project() and each
subdirectory project() into the corresponding build directory.  Do not
clobber them all with the one for the last subproject.  This mistake was
left from when the Xcode generator did not produce subprojects.
2011-12-09 13:00:22 -05:00
KWSys Robot 33c24b2100 KWSys Nightly Date Stamp 2011-12-09 00:05:08 -05:00
KWSys Robot e61d2ded80 KWSys Nightly Date Stamp 2011-12-08 00:05:03 -05:00
David Cole d050d6b58b Merge topic 'AutomocIncludedDotMocFileHandling'
2d11951 Merge branch 'master' into AutomocIncludedDotMocFileHandling
1eca18f automoc: add documentation for CMAKE_AUTOMOC_STRICT_MODE
bc278ce automoc: fix line length
62e223e automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing
40c5167 automoc: accept even more .moc files in non-strict mode
c207f5d automoc: also accept other files when .moc is included in non-strict mode
9c0df72 automoc: add a StrictParseCppFile(), which is only qmake-compatible
174bf35 automoc: move the code for finding headers into separate function
8507eae automoc: fix handling of included _p.moc files
7ada172 automoc: some more linebreaks for the warnings for better readability
3b93e26 automoc: add extra check whether the header contains Q_PRIVATE_SLOT
4745715 Add a test case for the use of Q_PRIVATE_SLOT.
bde4edb automoc: add special handling for including basename_p.moc, with test
74ab0f6 automoc: move some code from the big parsing loop into separate functions
bc7560e automoc: add test for including a moc_abc_p.cpp file
30fd8e6 automoc: add test for including the moc file from another header
...
2011-12-07 16:47:35 -05:00
David Cole 174ecf51f8 Merge topic 'refactor-versioned-lib-names'
96f65ba cmTarget: Create helper method for versioned library names
2011-12-07 16:46:35 -05:00
David Cole 2d1195123e Merge branch 'master' into AutomocIncludedDotMocFileHandling
Conflicts:
	Source/cmTarget.cxx
2011-12-07 16:29:13 -05:00
Brad King fa7141f5ad Add framework to detect compiler version with its id (#12408)
Teach CMakePlatformId.h to construct an "INFO:compiler_version[]" string
literal from macros COMPILER_VERSION_(MAJOR|MINOR|PATCH|TWEAK) to be
defined in CMake(C|CXX)CompilerId.(c|cpp) for each compiler.  Provide
conversion macros DEC() and HEX() to decode decimal or hex digits from
integer values.  Parse the version out of the compiler id binary along
with the other INFO values already present.

Store the result in variable CMAKE_<LANG>_COMPILER_VERSION in the format
"major[.minor[.patch[.tweak]]]".  Save the value persistently in
CMake(C|CXX)Compiler.cmake in the build tree.  Document the variable for
internal use since we do not set it everywhere yet.

Report the compiler version on the compiler id result line e.g.

  The C compiler identification is GNU 4.5.2

Report CMAKE_(C|CXX)_COMPILER_(ID|VERSION) in SystemInformation test.
2011-12-07 08:59:51 -05:00
KWSys Robot 6fb2a38b0a KWSys Nightly Date Stamp 2011-12-07 00:05:03 -05:00
David Cole 386cf3c593 Merge topic 'GNU-to-MS'
ae62a1c Test CMAKE_GNUtoMS option in ExportImport on MinGW and MSys
afb00fe Add CMAKE_GNUtoMS option to convert GNU .dll.a to MS .lib
61e8629 Factor makefile generator link rule lookup into helper function
a603250 Load platform files that need to know the ABI when possible
ecd8414 Fortran: Detect pointer size in gfortran on MinGW
2011-12-06 15:07:39 -05:00