kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
30,600 Commits 1 Branch 14 Tags 53 MiB
Commit Graph

30600 Commits

Author SHA1 Message Date
Brad King 85e0bb84f5 libarchive: Avoid using 'uint8_t' as bitfield type 
The IBM XL compiler does not like it.  Use plain 'unsigned' instead.
 2015-10-22 10:18:27 -04:00
Brad King c70491d671 libarchive: Avoid using name 'hz' 
AIX system headers define the symbol 'hz' as a preprocessor macro.
 2015-10-22 10:18:27 -04:00
Brad King 1bbba477c7 libarchive: Drop outdated CMake portability snprintf 
The archive_read_support_format_zip.c source no longer calls snprintf
directly so we do not need a portability macro for it.
 2015-10-22 10:18:26 -04:00
Brad King 64bdf0b746 libarchive: Avoid non-portable u_int8_t 
Use uint8_t that we prepare in config.h instead.
 2015-10-22 10:18:26 -04:00
Brad King 8f837fc9a9 libarchive: Use CommonCrypto APIs on OS X only when available 
Use each CommonCrypto API only when using an OS X SDK version new enough
to provide it.
 2015-10-22 10:18:26 -04:00
Brad King 61a0251e82 libarchive: Define O_CLOEXEC when missing 
Do this in archive_random.c as we do in several other sources already.
 2015-10-22 10:18:26 -04:00
Kitware Robot 9e5f253f8d CMake Nightly Date Stamp 2015-10-22 00:01:08 -04:00
Stephen Kelly a8c0fbcc19 cmLocalGenerator: Store a vector of generator targets. 
Not a map from cmTarget to cmGeneratorTarget.
 2015-10-21 23:21:01 +02:00
Brad King 56cec75058 Merge branch 'release' 2015-10-21 13:02:46 -04:00
Brad King 832fe4b133 libarchive: Fix VS 7.1 Debug build 
This version of the MS C runtime library forgets to export
_byteswap_ushort.
 2015-10-21 11:34:28 -04:00
Brad King 0b82f51a30 libarchive: Guard bcyrpt.h with HAVE_BCRYPT_H 2015-10-21 11:18:50 -04:00
Brad King 5333c04cd0 libarchive: Drop CMake-specific Borland compiler workaround 
We no longer build CMake with the Borland compiler.
 2015-10-21 10:31:57 -04:00
Brad King e861e12f6e libarchive: Define version macro before first use 2015-10-21 10:30:29 -04:00
Brad King 932848f420 Merge branch 'libarchive-upstream' into update-libarchive 
Resolve conflicts by integrating changes from both sides.
 2015-10-21 10:18:52 -04:00
LibArchive Upstream 1a8c7bc2c6 libarchive 3.1.2-601-g3bfe5f1 (reduced) 
Extract upstream libarchive using the following shell code.

url=git://github.com/libarchive/libarchive.git &&
v=3.1.2-601-g3bfe5f1 &&
r=3bfe5f1 &&
paths="
  CMakeLists.txt
  COPYING
  CTestConfig.cmake
  build/cmake
  build/pkgconfig
  build/utils
  build/version
  libarchive/*.*
" &&
mkdir libarchive-$v-g$r-reduced &&
git clone $url libarchive-git &&
date=$(cd libarchive-git && git log -n 1 --format='%cd' $r) &&
(cd libarchive-git && git archive --format=tar $r -- $paths) |
(cd libarchive-$v-g$r-reduced && tar xv) &&
fromdos libarchive-$v-g$r-reduced/build/cmake/Find*.cmake &&
echo "g$r date: $date"
 2015-10-21 09:37:00 -04:00
Brad King 498db9b9bc CMake 3.4.0-rc2 2015-10-21 09:26:43 -04:00
Brad King e4b7d5afde Merge branch 'release' 2015-10-21 09:25:29 -04:00
Brad King 9206120e30 Merge topic 'use-generator-target' 
c099e00f Access policy status from cmGeneratorTarget at generate time.
d74bca5a cmGeneratorTarget: Copy the policy map from the cmTarget.
c6e86955 cmTarget: Remove unused NameResolvesToFramework.
18046bd5 cmCommonTargetGenerator: Use NameResolvesToFramework without cmTarget.
91411641 Move ComputeLinkType out of cmTarget.
6d94078e cmGeneratorTarget: Move IsDLLPlatform from cmTarget.
3ebc6285 cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.
311018e5 cmGeneratorTarget: Move GetExportMacro from cmTarget.
215cd21a cmGeneratorTarget: Provide direct access to the backtrace.
1df8bd3a cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget.
83703bda cmGeneratorTarget: Copy IsExecutableWithExports from cmTarget.
 2015-10-21 09:17:01 -04:00
Brad King d31d92bf1d Merge topic 'inline-cmMakeDepend-content' 
c0969b10 cmMakeDepend: Inline into inheriting class.
6a1e7328 cmMakeDepend: Inline into only user.
00f50b00 cmMakeDepend: Inline into header.
3df749af Remove vestigial declarations.
3029c27e cmMakeDepend: Use public cmMakefile API.
 2015-10-21 09:16:58 -04:00
Brad King 740f85a204 Merge topic 'cmLocalGenerator-generator-target-storage' 
a4bbdc5e cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.
04b6bb16 cmLocalGenerator: Simplify semantic of adding generator targets.
400e3d19 cmLocalGenerator: Don't store imported generator targets
726e461b CMP0063: Split unit test by target type.
 2015-10-21 09:16:56 -04:00
Brad King 8bcf2c81fc Merge topic 'ninja-refactor-deptype-selection' 
123de191 Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains
 2015-10-21 09:16:53 -04:00
Brad King 196de9d14d Merge topic 'deprecate-CMakeForceCompiler' 
ed77504d CMakeForceCompiler: Deprecate this module and its macros
 2015-10-21 09:16:51 -04:00
Brad King e2d4bfef3f Merge topic 'fix-CMP0054-elseif-warning' 
d6a03b47 cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)
 2015-10-21 09:16:49 -04:00
Brad King f1de724f41 Merge topic 'doc-file-GLOB-no-order' 
5a208f83 Help: Document that file(GLOB*) order is undefined
 2015-10-21 09:16:47 -04:00
Brad King 2ad1fed8ee Merge branch 'fix-CMP0054-elseif-warning' into release 2015-10-21 09:05:57 -04:00
Brad King 779b6ac4f8 Merge branch 'doc-file-GLOB-no-order' into release 2015-10-21 08:53:30 -04:00
Ruslan Baratov 5a208f834e Help: Document that file(GLOB*) order is undefined 
Since this command use 'readdir' under the hood the order of list is
undefined:
* http://stackoverflow.com/questions/8977441/does-readdir-guarantee-an-order
 2015-10-21 08:51:54 -04:00
Kitware Robot 893a7fc2ed CMake Nightly Date Stamp 2015-10-21 00:01:06 -04:00
Stephen Kelly a4bbdc5ecf cmLocalGenerator: Remove cmGeneratorTargetsType from setter API. 2015-10-21 01:18:27 +02:00
Stephen Kelly c099e00fc0 Access policy status from cmGeneratorTarget at generate time. 2015-10-21 00:52:23 +02:00
Stephen Kelly d74bca5a8f cmGeneratorTarget: Copy the policy map from the cmTarget. 2015-10-21 00:52:23 +02:00
Stephen Kelly c6e8695508 cmTarget: Remove unused NameResolvesToFramework. 2015-10-21 00:52:23 +02:00
Stephen Kelly 18046bd50a cmCommonTargetGenerator: Use NameResolvesToFramework without cmTarget. 2015-10-21 00:52:22 +02:00
Stephen Kelly 91411641a7 Move ComputeLinkType out of cmTarget. 
Keep it out of the way, so that it does not become part of cmGeneratorTarget,
but where it can be used to implement CMP0003.
 2015-10-21 00:52:22 +02:00
Stephen Kelly 6d94078e62 cmGeneratorTarget: Move IsDLLPlatform from cmTarget. 2015-10-21 00:52:22 +02:00
Stephen Kelly 3ebc62850c cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget. 2015-10-21 00:52:22 +02:00
Stephen Kelly 311018e5ad cmGeneratorTarget: Move GetExportMacro from cmTarget. 2015-10-21 00:52:22 +02:00
Stephen Kelly c0969b1033 cmMakeDepend: Inline into inheriting class. 
Devirtualize the API.
 2015-10-21 00:41:53 +02:00
Stephen Kelly 6a1e73281f cmMakeDepend: Inline into only user. 2015-10-21 00:41:26 +02:00
Stephen Kelly 00f50b006c cmMakeDepend: Inline into header. 2015-10-21 00:39:51 +02:00
Stephen Kelly 215cd21a02 cmGeneratorTarget: Provide direct access to the backtrace. 2015-10-21 00:37:03 +02:00
Stephen Kelly 1df8bd3ab0 cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget. 2015-10-21 00:37:01 +02:00
Stephen Kelly 83703bda7d cmGeneratorTarget: Copy IsExecutableWithExports from cmTarget. 2015-10-21 00:36:09 +02:00
Stephen Kelly 3df749af55 Remove vestigial declarations. 2015-10-21 00:19:57 +02:00
Stephen Kelly 3029c27e46 cmMakeDepend: Use public cmMakefile API. 2015-10-21 00:19:45 +02:00
Stephen Kelly 04b6bb1676 cmLocalGenerator: Simplify semantic of adding generator targets. 
Don't store on the global generator as a side effect.  Update clients to adapt.
 2015-10-20 23:58:49 +02:00
Stephen Kelly 400e3d19fc cmLocalGenerator: Don't store imported generator targets 
No consumers need them.  This makes GetGeneratorTargets more comparable
to cmMakefile::GetTargets, which does not include imported targets.
 2015-10-20 23:58:48 +02:00
Stephen Kelly 726e461b38 CMP0063: Split unit test by target type. 
Don't rely on the order of warnings for targets being deterministic.
 2015-10-20 23:58:48 +02:00
Stephen Kelly d6a03b475e cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802) 
Commit v3.4.0-rc1~494^2~4 (cmMakefile: Add API for elseif to create
backtrace., 2015-05-29) removed the use of cmMakefileCall to push/pop
execution context in favor of a new way to create backtraces.

However, a call to cmMakefile::GetExecutionContext is still invoked to
issue a contextual CMP0054 warning through cmConditionEvaluator.  As
the elseif is not part of the call stack, this resulted in trying to
access an empty vector.

Avoid the attempt at getting execution context when evaluating elseif by
constructing a context and backtrace on behalf of the cmConditionEvaluator
in all cases.
 2015-10-20 23:40:12 +02:00
Brad King 123de1914c Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains 
Set variables in the platform information modules to tell the Ninja
generator what deps type to use instead of hard-coding conditions in the
generator itself.
 2015-10-20 14:14:20 -04:00