Commit Graph

11952 Commits

Author SHA1 Message Date
David Cole 2444d6f55e Merge topic 'split-stdout-stderr'
a343bc1 RunSingleCommand: Avoid assignment in condition
642f100 RunSingleCommand: Add a OUTPUT_NORMAL flag.
856a9e4 RunSingleCommand: Replace verbose boolean with enum
4096066 RunSingleCommand: Fix indentation
2011-08-02 15:09:57 -04:00
David Cole 39faba7e30 Merge topic 'cmSystemTools-whitespace'
acd2f84 cmSystemTools: Remove trailing whitespace
2011-08-02 15:09:53 -04:00
David Cole c6051b7abd Merge topic 'library-multiarch-issue-12326'
317d077 multiarch: Treat lib/<arch> as implicit link dir (#12326)
2011-08-02 15:09:45 -04:00
David Cole 2c7b38afa6 Merge topic 'FeatureSummaryImprovements'
b62349c FeatureSummary.cmake: update documentation
f366cf8 FeatureSummary.cmake: cosmetics
f407bb5 FeatureSummary.cmake: only higher TYPEs can override previous TYPEs
02d47ab FeatureSummary.cmake: error out when a REQUIRED package is missing
91a1527 FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keyword
0671a02 FeatureSummary.cmake: remove "comment" field
aae13f4 Extend FeatureSummary: add PURPOSE of package and TYPE
2011-08-02 15:09:41 -04:00
KWSys Robot d8c1b44790 KWSys Nightly Date Stamp 2011-08-02 00:13:05 -04:00
Alex Neundorf e2e8c0a412 Also put builtin include dirs into CodeBlocks project file
Refactor code from CMakeFindEclipseCDT4.cmake so it can be used
alkso for CodeBlocks, and move it into new file
CMakeExtraGeneratorDetermineCompilerMacrosAndIncludeDirs.cmake.

Alex
2011-08-02 01:46:39 +02:00
Alex Neundorf 92c0dc50fc Remove useless line of code
Alex
2011-08-02 01:05:24 +02:00
Alex Neundorf d216a67e4a Provide macro write_basic_config_version_file()
This macro can be used to generate basic version files which can be
installed along a Config.cmake file to provide versioning support.

This (3rd try) is implemented using a macro, which maps
the COMPATIBILITY mode to a filename and configure_file()s the
resulting file.

Alex
2011-08-01 22:59:18 +02:00
KWSys Robot cbaf944568 KWSys Nightly Date Stamp 2011-08-01 00:13:34 -04:00
KWSys Robot 4d9874440a KWSys Nightly Date Stamp 2011-07-31 00:14:04 -04:00
KWSys Robot 55022455d0 KWSys Nightly Date Stamp 2011-07-30 00:14:02 -04:00
Brad King 1f641de4b8 Documentation: WIN32 not defined on Cygwin (#12334)
Since commit 85c0a69a (Cygwin: Do not define 'WIN32', 2010-12-17) WIN32
is not defined on Cygwin.  Update documentation of the WIN32 variable
accordingly.
2011-07-29 18:40:56 -04:00
Alex Neundorf a5683f80bd Patch by Campbell Barton: puts definitions into C::B project file
This enables Codeblocks and QtCreator to do proper highlighting based
on defined macros.

Alex
2011-07-29 23:51:31 +02:00
Alex Neundorf f32f6f0652 Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)
This causes that all files in C::B are displayed in a tree starting at /

Alex
2011-07-29 23:24:21 +02:00
Clinton Stimpson e6d2bcfde2 CPack/NSIS: Fix reinstall and multiple install issues when using components.
Fix NSIS template to more thoroughly use CPACK_PACKAGE_INSTALL_REGISTRY_KEY.
This allows different versions of software to have a separate sections in the
registry to keep track of things (installed components, and uninstall stuff).

Change default of CPACK_PACKAGE_INSTALL_REGISTRY_KEY to follow the value of
CPACK_PACKAGE_INSTALL_DIRECTORY so if an installation overwrites another installation,
the proper registry entries are more likely to be overwritten.

Fix CPack/NSIS generator to not insert code in the NSIS template to skip installation
of already installed components.  This enables a repair like behavior and also enables
installing patch releases on top of an older installation.
2011-07-29 12:23:22 -06:00
Steven Velez 05ddfbfe95 VS10: Add SCC support
Honor the properties that were added for earlier versions
of visual studio.
2011-07-29 14:06:28 -04:00
David Cole 37d8602cde Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals
Conflicts:
	Source/cmLocalVisualStudio7Generator.h
2011-07-29 10:22:33 -04:00
David Cole df9577259c Add support for Visual Studio project-specific globals (#8707)
Thanks to Pau Garcia i Quiles for the inspiration for the patch.
I've tweaked it a bit compared to what's in the bug tracker: this
commit does not allow empty global variable names.

I also added usage of the new feature to an existing test. Although
it has no effect on the resulting Visual Studio projects, you can
verify that the VSResource test produces a non-empty globals section
in the generated .vcproj(x) files.
2011-07-29 10:04:36 -04:00
KWSys Robot 5ef20b2dc5 KWSys Nightly Date Stamp 2011-07-29 00:14:03 -04:00
Brad King a343bc1c76 RunSingleCommand: Avoid assignment in condition
Several compilers warn about this case even when an extra layer of
parenthesis surrounds the assignment.  Make the condition explicit.
2011-07-28 10:43:11 -04:00
Johan Björk 642f10066a RunSingleCommand: Add a OUTPUT_NORMAL flag.
OUTPUT_NORMAL does no processing of the output streams, it just passes
them through the same streams as they were received on.
2011-07-28 10:43:09 -04:00
Johan Björk 856a9e499f RunSingleCommand: Replace verbose boolean with enum
No behaviour change, this prepares for adding a flag to skip the merging
of output streams.
2011-07-28 10:42:03 -04:00
Brad King 4096066723 RunSingleCommand: Fix indentation 2011-07-28 10:28:52 -04:00
Brad King acd2f84cc0 cmSystemTools: Remove trailing whitespace 2011-07-28 10:23:13 -04:00
KWSys Robot b6fb213ed1 KWSys Nightly Date Stamp 2011-07-28 00:12:21 -04:00
Modestas Vainius 317d077f6e multiarch: Treat lib/<arch> as implicit link dir (#12326)
Add multiarch library directories to the set of implicit link
directories.  In particular, this keeps lib/<arch> out of R(UN)PATH.
2011-07-27 09:13:58 -04:00
KWSys Robot 49a00ec2de KWSys Nightly Date Stamp 2011-07-27 00:14:05 -04:00
Brad King d6b2a1a9b3 Merge topic 'effective-platform-name'
74c73d5 Correct KWStyle line too long error
0c030ef Add use of EFFECTIVE_PLATFORM_NAME to generated Xcode projects.
2011-07-26 14:57:41 -04:00
Brad King 119dce33d3 Merge topic 'SetPropertyAppendString'
9dbba1b Fix #12342: Add APPEND_STRING option to set_property()
2011-07-26 14:57:32 -04:00
Brad King dc96b975c5 Merge topic 'MinorImprovementToTryCompileDocs'
d6b9df4 Minor fix to try_compile() docs (#12333)
2011-07-26 14:57:26 -04:00
Brad King 9ac8c938bb Merge topic 'doc-custom-command-multiple-targets-issue-12311'
0ece8f7 Document caveat of custom commands in multiple targets (#12311)
2011-07-26 14:56:48 -04:00
Brad King 25a35f5686 Merge topic 'DisableSwitchForFindPackage'
4a50b5f Add a basic test for CMAKE_DISABLE_FIND_PACKAGE_<package>
a66df08 Add documentation for the CMAKE_DISABLE_FIND_PACKAGE_<Name> switch
6e1d3ed Add a switch to disable a find_package() call completely
2011-07-26 14:56:22 -04:00
Brad King 9340ab28cc Merge topic 'performance_fix'
3e4ba89 Only pay for unused variable checking if it is on.
2011-07-26 14:55:21 -04:00
Brad King 4a18c30a42 Merge topic 'vs-ia64'
aed92cc Add VisualStudio 9 and 10 generators for Itanium platform
d44c68f VS: Factor Find64BitTools out of Win64 generator to parent
2011-07-26 14:54:56 -04:00
Brad King b3dba1a145 Merge topic 'mingw-make-use-native-echo-issue-12283'
6b4d3ad MinGW: Remove old workaround and use native echo (#12283)
2011-07-26 14:54:21 -04:00
KWSys Robot 0a939c86d6 KWSys Nightly Date Stamp 2011-07-26 00:13:12 -04:00
KWSys Robot 1a81da37b8 KWSys Nightly Date Stamp 2011-07-25 00:13:07 -04:00
KWSys Robot cb93c62643 KWSys Nightly Date Stamp 2011-07-24 00:13:03 -04:00
KWSys Robot c70c62db55 KWSys Nightly Date Stamp 2011-07-23 00:14:05 -04:00
KWSys Robot 5282623658 KWSys Nightly Date Stamp 2011-07-22 00:13:04 -04:00
KWSys Robot 3c33c5c5c2 KWSys Nightly Date Stamp 2011-07-21 00:14:05 -04:00
KWSys Robot c2deeae469 KWSys Nightly Date Stamp 2011-07-20 00:13:04 -04:00
David Cole 74c73d5fa0 Correct KWStyle line too long error 2011-07-19 11:33:01 -04:00
KWSys Robot 9923a2a2d5 KWSys Nightly Date Stamp 2011-07-19 00:14:04 -04:00
David Cole 0c030ef72c Add use of EFFECTIVE_PLATFORM_NAME to generated Xcode projects.
Facilitates building iOS projects, enabling switching back and forth
between simulator and device builds at development time.
2011-07-18 16:37:06 -04:00
KWSys Robot fefaaa09d9 KWSys Nightly Date Stamp 2011-07-18 00:10:09 -04:00
Alex Neundorf 91a1527735 FeatureSummary.cmake: add INCLUDE_QUIET_PACKAGES keyword
Now found packages are not stored in ENABLED/DISABLED_FEATURES
anymore, but always in PACKAGES_FOUND/NOT_FOUND.
ENABLED/DISABLED_FEATURES is now only used via
ADD_FEATURE_INFO(), e.g. for stuff set via option().

Alex
2011-07-17 17:48:00 +02:00
KWSys Robot 07bb5b77ec KWSys Nightly Date Stamp 2011-07-17 00:14:04 -04:00
KWSys Robot 5d963edc5e KWSys Nightly Date Stamp 2011-07-16 00:10:06 -04:00
Alex Neundorf 9dbba1b464 Fix #12342: Add APPEND_STRING option to set_property()
set_property() has APPEND, which creates a list. E.g. when
appending to COMPILE_FLAGS a string is needed, not a list.
With the APPEND_STRING option the value is append as string,
not as list.

Alex
2011-07-15 20:57:33 +02:00
KWSys Robot 8b238f4945 KWSys Nightly Date Stamp 2011-07-15 00:12:06 -04:00
KWSys Robot 60087f7128 KWSys Nightly Date Stamp 2011-07-14 00:10:22 -04:00
KWSys Robot 37340687a4 KWSys Nightly Date Stamp 2011-07-13 00:13:06 -04:00
Alex Neundorf d6b9df409c Minor fix to try_compile() docs (#12333)
Alex
2011-07-12 22:37:38 +02:00
KWSys Robot 39a9403a70 KWSys Nightly Date Stamp 2011-07-12 00:14:11 -04:00
KWSys Robot dabdf9248f KWSys Nightly Date Stamp 2011-07-11 00:10:05 -04:00
KWSys Robot 349c5c2160 KWSys Nightly Date Stamp 2011-07-10 00:13:04 -04:00
KWSys Robot 57109cb67f KWSys Nightly Date Stamp 2011-07-09 00:10:10 -04:00
Bill Hoffman 6c72d25aee Initial support for Intel Fortran VS2010. 2011-07-08 17:08:43 -04:00
KWSys Robot b4b134a4fa KWSys Nightly Date Stamp 2011-07-08 00:13:11 -04:00
KWSys Robot a8e0287d86 KWSys Nightly Date Stamp 2011-07-07 00:12:12 -04:00
KWSys Robot 69ed07ad2d KWSys Nightly Date Stamp 2011-07-06 00:14:08 -04:00
KWSys Robot aa20138dbc KWSys Nightly Date Stamp 2011-07-05 00:12:06 -04:00
KWSys Robot 127bcb39bc KWSys Nightly Date Stamp 2011-07-04 00:12:05 -04:00
KWSys Robot 42eef30652 KWSys Nightly Date Stamp 2011-07-03 00:12:11 -04: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
Brad King 0ece8f79ed Document caveat of custom commands in multiple targets (#12311)
A common mistake when using custom commands is to list the output of a
command in multiple targets that may build in parallel.  Warn against
this case in the documentation and suggest a better approach.
2011-06-30 08:43:32 -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
Alex Neundorf a66df08543 Add documentation for the CMAKE_DISABLE_FIND_PACKAGE_<Name> switch
Alex
2011-06-23 11:09:41 +02: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 3e4ba898c1 Only pay for unused variable checking if it is on. 2011-06-21 15:59:10 -04:00
Alex Neundorf 6e1d3edb4d Add a switch to disable a find_package() call completely
As discussed, this adds a switch CMAKE_DISABLE_FIND_PACKAGE_<name>,
which, when set to TRUE, keeps the find_package() command from executing.
When the package is REQUIRED at the same time, an error is generated.

Alex
2011-06-21 21:18:23 +02: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
Matej Hribernik aed92ccea6 Add VisualStudio 9 and 10 generators for Itanium platform 2011-06-20 08:31:13 -04:00
Matej Hribernik d44c68f39e VS: Factor Find64BitTools out of Win64 generator to parent
It will be shared with a forthcoming IA64 generator.
2011-06-20 08:29:40 -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
Brad King 6b4d3ad32a MinGW: Remove old workaround and use native echo (#12283)
The workaround added by commit 7e92f0b4 (Hack to make echo command work
properly in mingw32-make, 2006-10-05) and updated by commit 69356d8a
(Juse use cmake -E echo instead of the native echo, 2006-10-13) no
longer seems necessary with modern mingw32-make.  Furthermore it slows
performance due to the time spent loading a cmake process instead of
plain echo.
2011-06-16 15:43:17 -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
Johan Björk eeeeca1082 XCode: Support target folders on XCode. 2011-06-07 10:44:27 -04:00
Johan Björk 59ed84e032 Xcode: Support multiple level nesting of XCode folders (#10039) 2011-06-07 10:21:49 -04:00
Johan Björk d0a403fd99 CMake: Move tokenize to cmSystemTools 2011-06-07 10:18:54 -04:00
Bill Hoffman 9d406cdb65 Fix for bug #11927, external project git clone step always runs vs10.
In cmMakefile.cxx GetCMakeCFGInitDirectory is replaced with
GetCMakeFilesDirectory for .rule files.  In some cases with
external projects, that directory will not exist.  With vs10
the .rule files must exist or the rule will run with every build.
This fix creates the path that the .rule file is in.  In addition,
it is now a CMake error if the .rule file can not be created.
2011-06-07 08:59:03 -04:00
KWSys Robot 08b109a87f KWSys Nightly Date Stamp 2011-06-07 00:12:06 -04:00
Brad King 44cdae921d Xcode: Fix parallel build depends with universal binaries (#11844)
A post-build phase of each target invokes the XCODE_DEPEND_HELPER.make
file to erase any targets that link to it.  Narrow the set of targets
tested by each post-build phase to those that depend on the newly
completed target.  This avoids removing files from partially built
unrelated targets that happen to be building in parallel.
2011-06-06 17:44:11 -04:00
Bill Hoffman dd52fc309d Fix a memory leak. 2011-06-06 16:41:17 -04:00
KWSys Robot 4b652ad0d9 KWSys Nightly Date Stamp 2011-06-06 00:13:03 -04:00
KWSys Robot e3aec95740 KWSys Nightly Date Stamp 2011-06-05 00:11:54 -04:00
KWSys Robot 43824d44f4 KWSys Nightly Date Stamp 2011-06-04 00:13:05 -04:00
KWSys Robot 597ab43604 KWSys Nightly Date Stamp 2011-06-03 00:13:11 -04:00
Brad King d72734c74c Merge topic 'file-DOWNLOAD-low-speed-timeout'
faa7ec6 Teach file(DOWNLOAD|UPLOAD) to timeout after inactivity
2011-06-02 11:29:27 -04:00
Brad King 170b4e5eae Merge topic 'fix-Xcode-spelling-issue-12231'
a27edd8 Fix XCode -> Xcode typos, notably in man page (#12231)
2011-06-02 11:29:18 -04:00
Brad King e606b6b7db Merge topic 'aix-gcc-2.9-issue-12233'
a4cba0e Fix plugin API for gcc 2.9-aix51-020209 (#12233)
2011-06-02 11:29:15 -04:00
Brad King a5507c3e86 Merge topic 'fix-10740-update-string-docs'
ecdad65 CMake: Update documentation of STRING(SUBSTRING) for length -1 (#10740)
2011-06-02 11:29:13 -04:00
Brad King 3232136fc8 Merge topic 'dont-compress-memcheck-output'
0e591ed Fix type conversion warning
9c3a0b9 We will actually compress memcheck output if the server supports it.
8024c53 Dynamic analysis test output should not be compressed.
2011-06-02 11:29:09 -04:00
Bill Hoffman 7815e90e21 Fix for bug#10798. VS10 did not append -I flags with COMPILE_FLAGS prop.
This fix adds a test for this case for all generators.
2011-06-02 10:28:10 -04:00
KWSys Robot 5764739f52 KWSys Nightly Date Stamp 2011-06-02 00:13:04 -04:00
Brad King faa7ec6e18 Teach file(DOWNLOAD|UPLOAD) to timeout after inactivity
Add option INACTIVITY_TIMEOUT to terminate the operation if there is no
progress for more than a given amount of time.
2011-06-01 09:55:42 -04:00
KWSys Robot 628b2a129f KWSys Nightly Date Stamp 2011-06-01 00:12:05 -04:00
Sean McBride a27edd8a05 Fix XCode -> Xcode typos, notably in man page (#12231) 2011-05-31 09:13:00 -04:00
Daniel R. Gomez a4cba0e8be Fix plugin API for gcc 2.9-aix51-020209 (#12233)
Use proper C function prototype syntax to satisfy this compiler.
2011-05-31 09:08:59 -04:00
KWSys Robot 8af1eaf499 KWSys Nightly Date Stamp 2011-05-31 00:12:04 -04:00
KWSys Robot 5e40058e26 KWSys Nightly Date Stamp 2011-05-30 00:13:03 -04:00
KWSys Robot 9c6e1e03d0 KWSys Nightly Date Stamp 2011-05-29 00:13:04 -04:00
KWSys Robot 909bab1f4f KWSys Nightly Date Stamp 2011-05-28 00:13:04 -04:00
Rolf Eike Beer ecdad65a45 CMake: Update documentation of STRING(SUBSTRING) for length -1 (#10740) 2011-05-27 16:25:08 -04:00
Zach Mullen 0e591ed4c2 Fix type conversion warning 2011-05-27 10:45:41 -04:00
KWSys Robot 1e885b1bb5 KWSys Nightly Date Stamp 2011-05-27 00:13:04 -04:00
Zach Mullen 9c3a0b9f14 We will actually compress memcheck output if the server supports it.
This change won't be functional until the next release of CDash due to the
version comparison.
2011-05-26 14:50:07 -04:00
KWSys Robot ba6579f7a3 KWSys Nightly Date Stamp 2011-05-26 00:12:06 -04:00
KWSys Robot 8b17fd6725 KWSys Nightly Date Stamp 2011-05-25 00:13:03 -04:00
Brad King e51bbc14f6 Merge topic 'output-compile-lines'
cdc2b41 Fix CompileCommandOutput test build on Windows
7039d1f Fix CompileCommandOutput test for Make tools not supporting spaces
4268e3d run_compile_commands: Cast istream::get() result to char
c45c60b run_compile_commands: Avoid extra stl vector conversion
7c5be51 run_compile_commands: Avoid shadow in std::map<>::at workaround
169bb05 Provide std::map<>::at for use in run_compile_commands
4e2185c Make std::map usage more portable in language=>flags/defines maps
a7e7a04 Fix run_compile_commands build on Apple GCC 3.3
c9174c0 Fix signed/unsigned comparison in EscapeJSON
8346a28 Only offer the compile command output feature on unix systems
0e6b05f Adds a test for the compile command line output.
5674844 make compile command output optional
fe07b05 implement cxx command output
65c0c24 cache flags and defines
3f064ef refactor flags and defines
2011-05-24 14:48:14 -04:00
Brad King c5e00bf0b2 Merge topic 'fix-11925-vcxproj-filters-mismatch'
a6b52bd VS10: Write header-only files in correct xml element (#11925)
2011-05-24 14:34:56 -04:00
Brad King 44b7f2f5bc Merge topic 'string-RANDOM-seed'
7ff98b7 Fix forced-seed argument type in string(RANDOM)
3d92c8c Explicitly cast time value in cmSystemTools::RandomSeed
eb6f461 VS 6: Define _WIN32_WINNT to load wincrypt.h correctly
e1b0a11 Improve string(RANDOM) default seed
2011-05-24 14:34:51 -04:00
Brad King 0f843584f3 Merge topic 'doc-output_required_files'
5cf4ff6 Document status of output_required_files command (#12214)
2011-05-24 14:34:48 -04:00
Brad King a78acb2c82 Merge topic 'fix-cpack-osxx11-perms'
0fb388c Ensure executable files have executable permissions.
2011-05-24 14:34:37 -04:00
Brad King da1b688325 Merge topic 'rule-messages'
dca304e Merge branch 'MakeCodeBlocksGeneratorNonVerbose2' into rule-messages
051cee0 Revert "Honor RULE_MESSAGES property for build target messages" (#12190)
2011-05-24 14:34:33 -04:00
Brad King 7ffb678e4b Merge topic 'intel-12-vs-2005'
3a8add0 ENH: Fix Intel 12 plugin project generation for VS < 10
2011-05-24 14:34:28 -04:00
KWSys Robot 0c64fcd309 KWSys Nightly Date Stamp 2011-05-24 00:12:11 -04:00
David Cole a6b52bd8ef VS10: Write header-only files in correct xml element (#11925) 2011-05-23 17:30:23 -04:00
Brad King 7ff98b7a8c Fix forced-seed argument type in string(RANDOM)
Clang points out that local variable 'seed' needs to be "unsigned int":

Source/cmStringCommand.cxx:828:21: warning: operands of ? are integers
of different signs: 'int' and 'unsigned int' [-Wsign-compare]
    srand(force_seed? seed : cmSystemTools::RandomSeed());
                    ^ ~~~~   ~~~~~~~~~~~~~~~~~~~~~~~~~~~
2011-05-23 15:57:41 -04:00
Brad King 5cf4ff6e1f Document status of output_required_files command (#12214)
This command is barely functional and exists only for historical
reasons.  State this in the documentation.
2011-05-23 13:21:15 -04:00
KWSys Robot cac769f3a7 KWSys Nightly Date Stamp 2011-05-23 00:12:39 -04:00
KWSys Robot b3bab3ce03 KWSys Nightly Date Stamp 2011-05-22 00:13:03 -04:00
KWSys Robot 41c83c1bdc KWSys Nightly Date Stamp 2011-05-21 00:13:03 -04:00
KWSys Robot c5aae0e625 KWSys Nightly Date Stamp 2011-05-20 00:12:09 -04:00
Brad King 3d92c8c827 Explicitly cast time value in cmSystemTools::RandomSeed
Use static_cast to avoid warnings like

 conversion to ‘unsigned int’ from ‘__time_t’ may alter its value
 conversion to ‘unsigned int’ from ‘__suseconds_t’ may alter its value

We do not care if the value is truncated because we are looking for just
32 bits anyway.
2011-05-19 07:56:04 -04:00
KWSys Robot 14abf9f3d8 KWSys Nightly Date Stamp 2011-05-19 00:10:07 -04:00
Brad King eb6f461fc1 VS 6: Define _WIN32_WINNT to load wincrypt.h correctly 2011-05-18 10:09:23 -04:00
Brad King c45c60b24f run_compile_commands: Avoid extra stl vector conversion
The Sun compiler does not provide the proper vector constructor to
initialize it from an iterator pair of a non-matching type.  Extend the
ParseUnixCommandLine API to provide a vector of the proper type so no
conversion is needed.
2011-05-18 09:44:28 -04:00
KWSys Robot c7d4cf1db1 KWSys Nightly Date Stamp 2011-05-18 00:12:05 -04:00
Brad King e1b0a11dd4 Improve string(RANDOM) default seed
The naive time(0) seed is unique only within one second.  Instead try to
read a real source of entropy and otherwise fall back to a combination
of the process id and high-resolution time.
2011-05-17 10:07:26 -04:00
Brad King 4e2185cbd0 Make std::map usage more portable in language=>flags/defines maps
Older versions of GCC, the HP compiler, and the SGI MIPSpro compiler do
not like the use of make_pair in this case and the conversions it
requires:

  a value of type "const char *" cannot be used to initialize an entity
  of type "char [1]"

  /usr/include/g++-3/stl_pair.h:68: assignment of read-only location

Instead use a map lookup pattern already used throughout the rest of our
source tree.
2011-05-17 08:50:55 -04:00
KWSys Robot dc2a45fa3f KWSys Nightly Date Stamp 2011-05-17 00:13:04 -04:00
Wesley Turner 0fb388c733 Ensure executable files have executable permissions.
Fix the OSX X11 CPack generator to make sure the installer
that it generates contains executable files.
2011-05-16 18:15:32 -04:00
Brad King c9174c0e4b Fix signed/unsigned comparison in EscapeJSON 2011-05-16 11:55:56 -04:00
Brad King dca304ec8d Merge branch 'MakeCodeBlocksGeneratorNonVerbose2' into rule-messages
Conflicts:
	Source/cmGlobalUnixMakefileGenerator3.cxx
	Source/cmGlobalUnixMakefileGenerator3.h
2011-05-16 11:28:07 -04:00
Brad King 051cee0096 Revert "Honor RULE_MESSAGES property for build target messages" (#12190)
This reverts commit dc36b34994.  It broke
dependency logic instead of only silencing messages.  Revert to previous
behavior.
2011-05-16 11:26:58 -04:00
Brad King 3a8add058b ENH: Fix Intel 12 plugin project generation for VS < 10
Suggested-by: Dick Munroe <munroe@csworks.com>
2011-05-16 10:13:04 -04:00
KWSys Robot a77dfb6d64 KWSys Nightly Date Stamp 2011-05-16 00:12:06 -04:00
KWSys Robot 41ce1ea2d4 KWSys Nightly Date Stamp 2011-05-15 00:12:04 -04:00
KWSys Robot 30bf6162be KWSys Nightly Date Stamp 2011-05-14 00:13:04 -04:00
KWSys Robot 69677ca471 KWSys Nightly Date Stamp 2011-05-13 00:12:04 -04:00
KWSys Robot da9ba5726f KWSys Nightly Date Stamp 2011-05-12 00:13:02 -04:00
KWSys Robot 692f62fc3e KWSys Nightly Date Stamp 2011-05-11 00:12:05 -04:00
Brad King 7faffc988c Merge topic 'doc-CMAKE_BUILD_TYPE-config-case-issue-12148'
d7d71eb Fix case typo in CMAKE_BUILD_TYPE docs (#12148)
2011-05-10 13:58:23 -04:00
Brad King a4d935933b Merge topic 'FixVirtualFoldersInEclipse'
a7d8d49 -fix VirtualFolders in Eclipse under Windows
2011-05-10 13:58:15 -04:00
KWSys Robot c32262bc04 KWSys Nightly Date Stamp 2011-05-10 00:10:21 -04:00
Brad King ee9fc4b1d3 KWSys: Fix leaked FILE in EncodeExecutable error case
This leak was detected by cppcheck static analysis.

Author: Hans Johnson <hans-johnson@uiowa.edu>
Change-Id: I1b81cb245acb9a6033f24ecc8d1452ca4df8371a
2011-05-09 08:40:03 -04:00
KWSys Robot afa83eb4cf KWSys Nightly Date Stamp 2011-05-09 08:40:03 -04:00
KWSys Robot 6aa45ac2ee KWSys Nightly Date Stamp 2011-05-08 00:12:16 -04:00
KWSys Robot d3e09bba6a KWSys Nightly Date Stamp 2011-05-07 00:13:05 -04:00
Alex Neundorf a7d8d49b8f -fix VirtualFolders in Eclipse under Windows
Under Windows "locationURI" must be used for virtual folders, while
"location" must be used only for linked folders. Under Linux it doesn't
seem to matter.

Alex
2011-05-06 22:44:45 +02:00
KWSys Robot 303c7e8f40 KWSys Nightly Date Stamp 2011-05-06 00:12:04 -04:00
KWSys Robot 19e3397942 KWSys Nightly Date Stamp 2011-05-05 00:10:10 -04:00
KWSys Robot aad6c4481d KWSys Nightly Date Stamp 2011-05-04 00:13:04 -04:00
Brad King d7d71ebda3 Fix case typo in CMAKE_BUILD_TYPE docs (#12148)
Reported-by: Stephen Kelly <steveire@gmail.com>
2011-05-03 12:49:41 -04:00
KWSys Robot 9c84f747c3 KWSys Nightly Date Stamp 2011-05-03 09:10:01 -04:00
KWSys Robot c71f5806d2 KWSys Nightly Date Stamp 2011-05-03 09:05:06 -04:00