summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* cmArchiveWrite: Preemptively adapt to future libarchive 4.0 changesBrad King2015-10-281-0/+4
|
* Update libarchive configuration within CMakeBrad King2015-10-281-0/+2
| | | | | | Hard-code libarchive build options to the way CMake needs them. Set them as internal cache entries so users do not see them when building CMake.
* libarchive: Update README-CMake.txt for new snapshotBrad King2015-10-281-4/+4
|
* libarchive: Drop use of pthread.h for CMake buildBrad King2015-10-281-0/+2
| | | | CMake does not use threads so we do not need this in our libarchive.
* libarchive: Do not use pthread.h API without headerBrad King2015-10-281-2/+1
|
* libarchive: Test for Clang builtin before using itBrad King2015-10-281-1/+4
| | | | The __builtin_bswap16 builtin is not available on Clang 2.1.
* libarchive: Avoid using 'uint8_t' as bitfield typeBrad King2015-10-221-8/+8
| | | | The IBM XL compiler does not like it. Use plain 'unsigned' instead.
* libarchive: Avoid using name 'hz'Brad King2015-10-221-3/+3
| | | | AIX system headers define the symbol 'hz' as a preprocessor macro.
* libarchive: Drop outdated CMake portability snprintfBrad King2015-10-221-4/+0
| | | | | The archive_read_support_format_zip.c source no longer calls snprintf directly so we do not need a portability macro for it.
* libarchive: Avoid non-portable u_int8_tBrad King2015-10-221-7/+7
| | | | Use uint8_t that we prepare in config.h instead.
* libarchive: Use CommonCrypto APIs on OS X only when availableBrad King2015-10-224-3/+20
| | | | | Use each CommonCrypto API only when using an OS X SDK version new enough to provide it.
* libarchive: Define O_CLOEXEC when missingBrad King2015-10-221-0/+4
| | | | Do this in archive_random.c as we do in several other sources already.
* libarchive: Fix VS 7.1 Debug buildBrad King2015-10-211-1/+1
| | | | | This version of the MS C runtime library forgets to export _byteswap_ushort.
* libarchive: Guard bcyrpt.h with HAVE_BCRYPT_HBrad King2015-10-211-1/+1
|
* libarchive: Drop CMake-specific Borland compiler workaroundBrad King2015-10-211-7/+0
| | | | We no longer build CMake with the Borland compiler.
* libarchive: Define version macro before first useBrad King2015-10-211-10/+10
|
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2015-10-21100-1031/+8235
|\ | | | | | | Resolve conflicts by integrating changes from both sides.
| * libarchive 3.1.2-601-g3bfe5f1 (reduced)LibArchive Upstream2015-10-21101-1073/+8276
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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"
* | Merge branch 'release'Brad King2015-10-210-0/+0
|\ \
| * \ Merge branch 'fix-CMP0054-elseif-warning' into releaseBrad King2015-10-2110-12/+108
| |\ \
| * \ \ Merge branch 'doc-file-GLOB-no-order' into releaseBrad King2015-10-211-1/+2
| |\ \ \
* | \ \ \ Merge topic 'use-generator-target'Brad King2015-10-2126-189/+221
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Access policy status from cmGeneratorTarget at generate time.Stephen Kelly2015-10-207-31/+29
| | | | | |
| * | | | | cmGeneratorTarget: Copy the policy map from the cmTarget.Stephen Kelly2015-10-204-17/+28
| | | | | |
| * | | | | cmTarget: Remove unused NameResolvesToFramework.Stephen Kelly2015-10-202-9/+0
| | | | | |
| * | | | | cmCommonTargetGenerator: Use NameResolvesToFramework without cmTarget.Stephen Kelly2015-10-201-1/+1
| | | | | |
| * | | | | Move ComputeLinkType out of cmTarget.Stephen Kelly2015-10-205-30/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Keep it out of the way, so that it does not become part of cmGeneratorTarget, but where it can be used to implement CMP0003.
| * | | | | cmGeneratorTarget: Move IsDLLPlatform from cmTarget.Stephen Kelly2015-10-204-6/+16
| | | | | |
| * | | | | cmGeneratorTarget: Move HaveWellDefinedOutputFiles from cmTarget.Stephen Kelly2015-10-205-15/+15
| | | | | |
| * | | | | cmGeneratorTarget: Move GetExportMacro from cmTarget.Stephen Kelly2015-10-2011-38/+41
| | | | | |
| * | | | | cmGeneratorTarget: Provide direct access to the backtrace.Stephen Kelly2015-10-206-22/+29
| | | | | |
| * | | | | cmGlobalGenerator: Port IsRootOnlyTarget to cmGeneratorTarget.Stephen Kelly2015-10-202-4/+4
| | | | | |
| * | | | | cmGeneratorTarget: Copy IsExecutableWithExports from cmTarget.Stephen Kelly2015-10-208-16/+25
| | | | | |
* | | | | | Merge topic 'inline-cmMakeDepend-content'Brad King2015-10-219-625/+496
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | cmMakeDepend: Inline into inheriting class.Stephen Kelly2015-10-201-175/+128
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Devirtualize the API.
| * | | | | | cmMakeDepend: Inline into only user.Stephen Kelly2015-10-204-465/+440
| | | | | | |
| * | | | | | cmMakeDepend: Inline into header.Stephen Kelly2015-10-204-374/+323
| | | | | | |
| * | | | | | Remove vestigial declarations.Stephen Kelly2015-10-203-6/+0
| | | | | | |
| * | | | | | cmMakeDepend: Use public cmMakefile API.Stephen Kelly2015-10-201-1/+1
| |/ / / / /
* | | | | | Merge topic 'cmLocalGenerator-generator-target-storage'Brad King2015-10-2120-94/+84
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | | cmLocalGenerator: Remove cmGeneratorTargetsType from setter API.Stephen Kelly2015-10-202-7/+1
| | | | | | |
| * | | | | | cmLocalGenerator: Simplify semantic of adding generator targets.Stephen Kelly2015-10-205-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't store on the global generator as a side effect. Update clients to adapt.
| * | | | | | cmLocalGenerator: Don't store imported generator targetsStephen Kelly2015-10-207-34/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No consumers need them. This makes GetGeneratorTargets more comparable to cmMakefile::GetTargets, which does not include imported targets.
| * | | | | | CMP0063: Split unit test by target type.Stephen Kelly2015-10-208-52/+74
| |/ / / / / | | | | | | | | | | | | | | | | | | Don't rely on the order of warnings for targets being deterministic.
* | | | | | Merge topic 'ninja-refactor-deptype-selection'Brad King2015-10-212-12/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 123de191 Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchains
| * | | | | | Ninja: Refactor selection of 'deps = ' value for MS-compatible toolchainsBrad King2015-10-202-12/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | Merge topic 'deprecate-CMakeForceCompiler'Brad King2015-10-212-3/+20
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ed77504d CMakeForceCompiler: Deprecate this module and its macros
| * | | | | | CMakeForceCompiler: Deprecate this module and its macrosBrad King2015-10-192-3/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module was added by commit v2.6.0~1489 (...supporting embedded compilers..., 2007-07-02) to avoid needing to build the compiler id detection source on toolchains that need special flags or linker files to produce executables. Since then CMake has learned other ways to identify such compilers (e.g. passing vendor-specific version flags and checking for vendor-specific banners in the output). Furthermore, CMake now detects a lot more than just the compiler id during language initialization in order to support things like <LANG>_STANDARD and COMPILE_FEATURES. Therefore CMakeForceCompiler is no longer a viable approach because it skips such detection. One remaining challenge to support toolchains that require special linker files is to build the test for a working compiler, compiler ABI detection binary, and other try_compile cases. This will have to be worked out as such cases are encountered.
* | | | | | | Merge topic 'fix-CMP0054-elseif-warning'Brad King2015-10-2110-12/+108
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | d6a03b47 cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)
| * | | | | | cmIfCommand: Issue CMP0054 warning with appropriate context. (#15802)Stephen Kelly2015-10-2010-12/+108
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.