Commit Graph

11845 Commits

Author SHA1 Message Date
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
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