Commit Graph

11794 Commits

Author SHA1 Message Date
David Cole
ab24bdeecc Merge topic 'cpack-nsis-multi-installs'
e6d2bcf CPack/NSIS: Fix reinstall and multiple install issues when using components.
2011-08-02 15:10:47 -04:00
David Cole
abc8586716 Merge topic 'fix-12299-add-vs10-scc-support'
05ddfbf VS10: Add SCC support
2011-08-02 15:10:31 -04:00
David Cole
86bae62bd1 Merge topic 'fix-8707-add-vs-globals'
df95772 Add support for Visual Studio project-specific globals (#8707)
2011-08-02 15:10:09 -04:00
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
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
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
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