Commit Graph

11828 Commits

Author SHA1 Message Date
David Cole 0923610b6d Merge topic 'fix-11746-sort-failed-tests-output'
4575ed9 Fix line too long style violation
ba4886b CTest: print failed tests in index order (#11746)
2011-08-16 17:02:23 -04:00
David Cole a772f21a7d Merge topic 'intel_fortran_vs2010'
3c53fbb Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
2011-08-16 17:01:33 -04:00
David Cole 6d5819ca6c Merge topic 'fix-8707-add-vs-globals'
37d8602 Merge topic 'intel_fortran_vs2010' into fix-8707-add-vs-globals
6c72d25 Initial support for Intel Fortran VS2010.
2011-08-16 17:01:28 -04:00
KWSys Robot 2bfd55a7c6 KWSys Nightly Date Stamp 2011-08-16 00:14:06 -04:00
KWSys Robot 87fa807fd8 KWSys Nightly Date Stamp 2011-08-15 00:13:05 -04:00
KWSys Robot 0ee93a81cd KWSys Nightly Date Stamp 2011-08-14 00:12:36 -04:00
KWSys Robot 27c8b8b455 KWSys Nightly Date Stamp 2011-08-13 00:13:07 -04:00
KWSys Robot 65ba6da576 KWSys Nightly Date Stamp 2011-08-12 00:14:04 -04:00
KWSys Robot 975ef3ef1a KWSys Nightly Date Stamp 2011-08-11 00:14:04 -04:00
KWSys Robot 563e3f0e0a KWSys Nightly Date Stamp 2011-08-10 00:14:02 -04:00
Brad King c04613a55d KWSys: __int64 and long long may be same type in specialization
For the specialization of hash<>(), the types long long and __int64
may be the same type. While the CMakeLists indicate that if __int64 is
a alias for another type the it will not be enabled, on mingw they
both appear to be the same type and enabled.

This patch only enable specialization for long long OR __int64 to
avoid the potential conflict.

Author: Bradley Lowekamp <blowekamp@mail.nih.gov>
Change-Id: I813a9ac008b296fab5a369c48e6dd5460fd0c035
2011-08-09 18:04:04 -04:00
KWSys Robot 4675f5d204 KWSys Nightly Date Stamp 2011-08-09 00:13:06 -04:00
Brad King 867c3dcd24 KWSys: Fix using long long and __int64 with hash_(set|map)
Added hash function for types long long and __int64, conditional on
detection by FundamentalType.

Author: Bradley Lowekamp <blowekamp@mail.nih.gov>
Change-Id: Ie273f55cd4387ca3dbbe00b9d96ad4935e456c9e
2011-08-08 08:50:07 -04:00
KWSys Robot 0e28009184 KWSys Nightly Date Stamp 2011-08-08 00:13:08 -04:00
KWSys Robot 2c14a176bb KWSys Nightly Date Stamp 2011-08-07 00:14:22 -04:00
KWSys Robot 955d5133ab KWSys Nightly Date Stamp 2011-08-06 00:14:05 -04:00
KWSys Robot ec4e4ce695 KWSys Nightly Date Stamp 2011-08-05 00:13:08 -04:00
Brad King 5f0eba49f2 KWSys: Avoid conversion warning in SystemTools::GetTime
Convert struct timeval members to double explicitly to avoid a GCC
warning with -Wconversion.
2011-08-04 08:30:05 -04:00
KWSys Robot f31def8c62 KWSys Nightly Date Stamp 2011-08-04 00:10:14 -04:00
Bill Hoffman 3c53fbb1f0 Fix custom commands in VS2010 Fortran projects using CFG_INTDIR and test.
For custom commands in VS2010 Fortran projects the INTDIR variable
is different than in the rest of the solution because Intel
fortran still uses the old VS project files even in VS2010. So,
we replace $(Configuration) directly in the project files. I have also
added a FortranOnly test that tests this feature and is run on any
generator that has Fortran abilities.
2011-08-03 17:24:43 -04:00
Brad King 74e1156bc2 KWSys: Simplify SystemTools::GetTime implementation (#12261)
We already use GetSystemTimeAsFileTime() and gettimeofday()
unconditionally on supported Windows and non-Windows platforms,
respectively.  Remove outdated portability complexity.
2011-08-03 14:50:04 -04:00
David Cole 4575ed9e2a Fix line too long style violation 2011-08-03 11:37:59 -04:00
David Cole ba4886b717 CTest: print failed tests in index order (#11746)
This deterministic ordering makes it easier for a developer
comparing the ctest output of two test runs to see what changed
from run to run.

Thanks to Fraser Hutchison for the patch.
2011-08-03 10:48:43 -04:00
KWSys Robot 14e54c4c44 KWSys Nightly Date Stamp 2011-08-03 00:14:04 -04:00
David Cole 80ef23d83f Merge topic 'CodeBlocksIncludeDirsAndDefines'
e2e8c0a Also put builtin include dirs into CodeBlocks project file
92c0dc5 Remove useless line of code
a5683f8 Patch by Campbell Barton: puts definitions into C::B project file
2011-08-02 15:11:58 -04:00
David Cole 11ca173731 Merge topic 'doc-WIN32-cygwin'
1f641de Documentation: WIN32 not defined on Cygwin (#12334)
2011-08-02 15:11:20 -04:00
David Cole e9a6d86d91 Merge topic 'ExcludeCMakesFilesFromCodeBlocksProject'
f32f6f0 Don't put files from CMAKE_ROOT into CodeBlocks projects (#12110)
2011-08-02 15:11:01 -04:00
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
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
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