kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,973 Commits 1 Branch 14 Tags
Commit Graph

12343 Commits

Author SHA1 Message Date
Brad King
9da8340a6d sha2: Suppress Borland warnings in third-party code 
The sha2 implementation performs cleanup on local variables.  Suppress
the warning instead of fixing it to minimize modification.
 2011-11-16 10:54:56 -05:00
Brad King
23b3df76a0 sha2: Use KWIML fixed-size integer constant macros 
Define SHA_UINT32_C and SHA_UINT64_C using the KWIML versions.
Use them in place of hard-coded UL and ULL constant suffixes.
 2011-11-16 10:48:10 -05:00
Brad King
2e9c26cf96 Add string(MD5) and string(SHA*) commands to compute hashes 
Provide a CMake-language binding to these cryptographic hashes.  Add a
string() command API for MD5, SHA1, SHA224, SHA256, SHA384, and SHA512.
 2011-11-16 10:29:35 -05:00
Brad King
293a7f4e2a cmCryptoHash: Provide factory "New" method 
Construct a cmCryptoHash subclass instance based on the name of the
desired hash algorithm.
 2011-11-16 10:15:44 -05:00
Brad King
46ab0561fc sha2: Use "static const" instead of "const static" declarations 
Fix old-style declarations in the original code.
 2011-11-16 10:15:44 -05:00
Brad King
38771d3bdf Add file(SHA*) commands to compute cryptographic hashes 
Add a file() command API for SHA1, SHA224, SHA256, SHA384, and SHA512.
 2011-11-16 10:15:44 -05:00
Brad King
73efd4a504 sha2: Build as part of CMakeLib 
Mangle sha2 symbols to avoid conflict with system libs.
 2011-11-16 10:15:44 -05:00
Brad King
c1856a33d4 sha2: Use KWIML fixed-size integer types and endian-ness 
These are more portable than those named in the original sha2 code.
 2011-11-16 10:15:44 -05:00
Brad King
fcc3ce5b0d Merge branch 'import-sha2' into crypto-hash 2011-11-16 10:15:13 -05:00
Brad King
042f7965c3 Add file(MD5) command to compute cryptographic hash 
Provide a CMake-language binding to the md5sum function previously
available only by "cmake -E md5sum".
 2011-11-16 10:15:01 -05:00
Brad King
ed7cef5634 Factor Compute(File|String)MD5 into cmCryptoHash helper 
Define an abstract API around the backend hash algorithm.  Expose
ifstream errors to HashFile callers.  Always try opening the file.
Succeed only if the end of file is reached without error.
 2011-11-16 10:14:53 -05:00
KWSys Robot
cbf453eeb6 KWSys Nightly Date Stamp 2011-11-16 03:25:07 -05:00
David Cole
7efd93cd72 Merge topic 'vs-version-ivar' 
c92ffec Enumerate VS11 version explicitly in local generators
1be4b6f Order VS local generator Version ivar values consistently
 2011-11-15 14:39:25 -05:00
David Cole
1e055d374e Merge topic 'automoc_qt5' 
bafe5cc Fix style.
74b9392 Update comments and method names to not be Qt4 specific.
812dab0 Don't assume the existence of QT_MAJOR_VERSION.
 2011-11-15 14:39:00 -05:00
David Cole
f1197ff0da Merge topic 'fix-11213-vs10-mfc-support' 
537020f Tests: Nudge MFC test to pass on VS 6 dashboards (#11213)
51f442e VS11: Update InstallRequiredSystemLibraries.cmake for VS11 (#11213)
d85ab7a Tests: Add environment logging to the MFC test (#11213)
011694c VS10: Use expected values for UseOfMfc (#11213)
a2e6d24 Tests: Fix MFC test to work with VS 10 and later (#11213)
 2011-11-15 14:38:56 -05:00
Brad King
c92ffece80 Enumerate VS11 version explicitly in local generators 
Since the parent commit the local generator Version ivar may be
compared for ordering.  Convert comparisons:

  "==VS10" becomes ">=VS10"
  "!=VS10" becomes "< VS10"

to support an explicit enumeration value for VS11 with no change
in behavior.
 2011-11-14 09:50:47 -05:00
Brad King
1be4b6f463 Order VS local generator Version ivar values consistently 
Move the Version member to the top cmLocalVisualStudioGenerator class
and set it consistently for instances created by all the global
generator versions.  Use an enumeration type with values scaled by a
factor of 10 so we can handle VS 7.1 without out-of-order numbers.

VS 7.1 support for SuppressStartupBanner was broken by commit 25116a3c
(Fix CMAKE_VERBOSE_MAKEFILE for VS10 vcxproj files, 2011-10-11) because
it assumed comparison of VS version numbers works.  Now it does.
 2011-11-14 09:47:31 -05:00
KWSys Robot
590c37e207 KWSys Nightly Date Stamp 2011-11-14 00:05:04 -05:00
Brad King
5d6cb1308d KWSys: Fix wrong spelling of __INTEL_COMPILER 
Author: Hans Johnson <hans-johnson@uiowa.edu>
Change-Id: I31a29a8b53e5262b76530b8ea80a1a66cff7b3f7
 2011-11-13 12:35:04 -05:00
Brad King
2f8f7ec56a KWSys: Remove trailing whitespace in SystemTools.cxx 2011-11-13 12:25:05 -05:00
KWSys Robot
9aa10f8045 KWSys Nightly Date Stamp 2011-11-13 11:32:56 -05:00
KWSys Robot
b90b6969f6 KWSys Nightly Date Stamp 2011-11-11 00:10:05 -05:00
Alex Neundorf
e44ebd5f9b automoc: another runtime optimization 
before doing the full regexp, try a simple strstr(), if this
already fails, no need to do the regexp matching.

Alex
 2011-11-10 22:54:44 +01:00
Alex Neundorf
1423177828 automoc: minor optimization 
Handing th std::string instead the char* to the find()
reduces the time from 17 to 15 seconds (for a 1000 times loop of a
relatively small file), which is around 10 percent.

Alex
 2011-11-10 22:41:48 +01:00
Alex Neundorf
f98e6151dc automoc: improved diagnostics 
Error/warning messages now look like:
AUTOMOC: (error|warning): <filename>: the actual text...

Alex
 2011-11-10 22:12:03 +01:00
Alex Neundorf
81c43b4fb6 automoc: handle the case when the developer includes the wrong mocfile 
There are multiple/many places in KDE where the developer includes
moc_foo.cpp, and expects moc to run on foo.cpp, instead of foo.h.
He should use foo.moc, but right now this is handled by automoc4,
so we must stay compatible. So support this too, but warn about
it.

Alex
 2011-11-10 22:12:03 +01:00
Alex Neundorf
7242822897 automoc: rework the checking for the matching header, to give better warnings 
Alex
 2011-11-10 22:12:03 +01:00
Alex Neundorf
d08bc32bc2 automoc: stricter checking for what file is included 
foo.cpp must include foo.moc to have itself processed by moc

Alex
 2011-11-10 22:11:32 +01:00
Stephen Kelly
b8c8cab242 Merge remote-tracking branch 'origin/master' into automoc_qt5 2011-11-10 15:46:13 +01:00
KWSys Robot
131d0ae4fc KWSys Nightly Date Stamp 2011-11-10 00:10:58 -05:00
Stephen Kelly
bafe5cc6e9 Fix style. 2011-11-10 00:57:21 +01:00
Stephen Kelly
74b9392eb9 Update comments and method names to not be Qt4 specific. 2011-11-09 23:26:09 +01:00
Stephen Kelly
812dab067e Don't assume the existence of QT_MAJOR_VERSION. 
Also handle Qt5SrcTools_MAJOR_VERSION.
 2011-11-09 23:20:20 +01:00
KWSys Robot
5675ec5e49 KWSys Nightly Date Stamp 2011-11-09 00:10:28 -05:00
David Cole
6478502efc Merge topic 'fix-typo' 
6d51f5f Fix typo.
 2011-11-08 14:43:44 -05:00
David Cole
a5579b76f0 Merge topic 'FixAutomocFromCCMakeFromPATH' 
83d02ee make automoc work when using ccmake via PATH (#12551)
 2011-11-08 14:43:38 -05:00
David Cole
5a3a5ba052 Merge topic 'watcom-cmake-shortpath-issue-12548' 
23381d8 Watcom: Use shortpath to CMake if full path has parens (#12548)
 2011-11-08 14:43:31 -05:00
David Cole
a985a9e0f7 Merge topic 'framework-with-space' 
e74f374 Fix linking to OS X Frameworks named with spaces (#12550)
 2011-11-08 14:43:18 -05:00
David Cole
e4085569a9 Merge topic 'FixTargetsInVirtualFoldersForEclipseIndigo' 
d31b1ac Eclipse: quote the build dir (to make it work with spaces)
0576331 Eclipse: make targets work from any directory
 2011-11-08 14:43:10 -05:00
David Cole
7ee0f580eb Merge topic 'EclipseWarnIfBuildDirIsSubDirOfSrcDir' 
4b93022 Eclipse: warn if CMAKE_BINARY_DIR is subdir of CMAKE_SOURCE_DIR
 2011-11-08 14:43:02 -05:00
David Cole
3452dadf89 Merge topic 'AddMocOptionsToAutomoc' 
2c648ab add documentation for the AUTOMOC_MOC_OPTIONS property
52719a1 automoc: fix #12541, support moc options
 2011-11-08 14:42:51 -05:00
David Cole
6c2f30822b Merge topic 'DontCrashAutomocWithEmptyCompileDefs' 
1ecc55a Automoc: fix the fix, need to use std::string, not just char* pointer
8c8305f don't crash in automoc with empty COMPILE_DEFINITIONS property
 2011-11-08 14:42:46 -05:00
David Cole
d8d4e801ac Merge topic 'fix-12549-one-more-SCC-setting' 
b0f0b3e VS: Add VS_SCC_AUXPATH target property (#12549)
 2011-11-08 14:42:41 -05:00
David Cole
67e3b64ab5 Merge topic 'automoc_qt5' 
c208ab8 Also run moc automatically with Qt5.
 2011-11-08 14:42:36 -05:00
KWSys Robot
7fe3484f20 KWSys Nightly Date Stamp 2011-11-08 00:11:46 -05:00
KWSys Robot
3de9669e1b KWSys Nightly Date Stamp 2011-11-07 00:10:07 -05:00
KWSys Robot
fce8e81895 KWSys Nightly Date Stamp 2011-11-06 00:10:30 -04:00
KWSys Robot
0727f38f71 KWSys Nightly Date Stamp 2011-11-05 00:08:47 -04:00
Stephen Kelly
6d51f5fa3c Fix typo. 2011-11-04 19:54:18 +01:00
David Cole
011694c269 VS10: Use expected values for UseOfMfc (#11213) 
Use expected values for the UseOfMfc xml element in
VS 10 .vcxproj files.

  CMAKE_MFC_FLAG=1 maps to "Static"
  CMAKE_MFC_FLAG=2 maps to "Dynamic"
  all other values map to "false"

Thanks to Randy Schott and McBen for their patches which
served as inspiration and motivation for getting this done.

See also http://public.kitware.com/Bug/view.php?id=11224
 2011-11-04 13:29:41 -04:00