summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'link-shared-depend-cycle-issue-12647' into check_symbol_existsRolf Eike Beer2012-01-166-3/+55
|\
| * Tolerate cycles in shared library link interfaces (#12647)Brad King2012-01-136-3/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 183b9509 (Follow all dependencies of shared library private dependencies, 2011-12-14) we honor LINK_INTERFACE_LIBRARIES when following dependent shared libraries. The link interface properties may form a cycle if set incorrectly by a project. Furthermore, the property LINK_DEPENDENT_LIBRARIES may form a cycle if set incorrectly by hand (though CMake should never generate one). In either case, do not follow the cycle forever when following the dependent shared library closure. We only need to add dependency edges to the constraint graph once. Add "LinkInterfaceLoop" test to cover this case.
* | add a test for Check{,CXX}SymbolExistsRolf Eike Beer2012-01-164-0/+123
| | | | | | | | | | Now that we think that CheckSymbolExists really works for all cases it is time to prove that. If this code fails too many other things will break.
* | CheckSymbolExists: force the compiler to keep the referenced symbolRolf Eike Beer2012-01-161-1/+1
|/ | | | | | | | | | | | Otherwise the compiler may optimize out the reference to the symbol as the previous version was not really using this. This leads to symbols that are only in a header but not in the given libraries to be reported as present. This came up on the first try to fix bug 11333 as "gcc -O3" would optimize out the reference to pthread_create() so the correct library the symbol is in was not detected. The new test code was suggested by Brad King.
* Add infrastructure for CMake-only testsBrad King2012-01-133-0/+22
| | | | | | | | Some tests only need to run CMake to configure and generate a build tree, but not actually perform the build. Add a new "Tests/CMakeOnly" directory dedicated for this purpose. Add a helper script to drive each test by creating a fresh build tree and running CMake on it. Add macro "add_CMakeOnly_test" to help create tests using the script.
* KWSys Nightly Date StampKWSys Robot2012-01-111-1/+1
|
* KWSys Nightly Date StampKWSys Robot2012-01-101-1/+1
|
* Merge topic 'early-exit-loop'David Cole2012-01-091-0/+1
|\ | | | | | | | | c959725 Exit the loop when we have determined the language.
| * Exit the loop when we have determined the language.Stephen Kelly2012-01-081-0/+1
| |
* | Merge topic 'fix-docs-typo'David Cole2012-01-091-2/+2
|\ \ | | | | | | | | | | | | 9bffb3f Fix typos arguement -> argument.
| * | Fix typos arguement -> argument.Stephen Kelly2012-01-081-2/+2
| |/
* | Merge topic 'FindRubyFixes'David Cole2012-01-091-3/+7
|\ \ | | | | | | | | | | | | | | | | | | a9bca05 FindRuby.cmake: add more debug output 3db2c8b FindRuby: add more possible library names (for ubuntu, #12172) 93c55ec FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172)
| * | FindRuby.cmake: add more debug outputAlex Neundorf2012-01-051-0/+4
| | | | | | | | | | | | Alex
| * | FindRuby: add more possible library names (for ubuntu, #12172)Alex Neundorf2012-01-051-1/+1
| | | | | | | | | | | | Alex
| * | FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172)Alex Neundorf2012-01-051-2/+2
| | | | | | | | | | | | Alex
* | | Merge topic 'update-libarchive'David Cole2012-01-09436-112680/+87214
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6c611c6 libarchive: Restore CMake 2.6.3 as minimum version 2f5b677 libarchive: Update README-CMake.txt for new snapshot 156cb3b Merge branch 'libarchive-upstream' into update-libarchive fd42bf1 libarchive: Set .gitattributes to allow trailing whitespace 4f4fe6e libarchive 3.0.2-r4051 (reduced) 65b6e19 libarchive: Avoid bogus conversion warning from PGI compiler 9ccaeb1 libarchive: Suppress PathScale compiler warnings 2309438 libarchive: Rename isoent_rr_move_dir parameter isoent => curent b6ca96e libarchive: Include linux/types.h before linux/fiemap.h f293b73 libarchive: Define _XOPEN_SOURCE=500 on HP-UX 6781a09 libarchive: Cleanup after ZLIB_WINAPI check f15d757 libarchive: Remove hard-coded build configuration 3a9f449 libarchive: Use Apple copyfile.h API only if available 6af6b96 libarchive: Do not use MNT_NOATIME if not defined 02d5e40 libarchive: Check for 'struct statvfs' member 'f_iosize' 8b7ee30 libarchive: Do not use ST_NOATIME if not defined ...
| * | | libarchive: Restore CMake 2.6.3 as minimum versionBrad King2012-01-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Upstream libarchive now requires CMake 2.8 to get the newer add_test functionality. Since we do not build libarchive's tests we do not need the requirement.
| * | | libarchive: Update README-CMake.txt for new snapshotBrad King2012-01-051-4/+4
| | | |
| * | | Merge branch 'libarchive-upstream' into update-libarchiveBrad King2012-01-0553-842/+814
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Utilities/cmlibarchive/CMakeLists.txt Utilities/cmlibarchive/libarchive/archive_windows.c
| | * | | libarchive 3.0.2-r4051 (reduced)LibArchive Upstream2012-01-0555-846/+820
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream libarchive using the following shell code. url=https://libarchive.googlecode.com/svn/release/3.0 v=3.0.2 r=4051 paths=" CMakeLists.txt COPYING CTestConfig.cmake build/cmake build/pkgconfig build/utils build/version libarchive/*.* " date=$(svn log -q -c$r $url | sed -n "/^r/ {s/[^|]*|[^|]*|//;p;}") svn export -r$r $url libarchive-$v-r$r && mkdir libarchive-$v-r$r-reduced && (cd libarchive-$v-r$r && tar c $paths) | (cd libarchive-$v-r$r-reduced && tar x) echo "r$r date: $date"
| * | | | libarchive: Set .gitattributes to allow trailing whitespaceBrad King2012-01-051-2/+2
| | | | | | | | | | | | | | | | | | | | We do not care about trailing whitespace in third-party code.
| * | | | libarchive: Avoid bogus conversion warning from PGI compilerBrad King2012-01-044-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We cannot suppress PGI compiler warnings completely because even with the "-w" flag the compiler still writes a message containing "compilation completed with warnings" to stderr. A warning is triggered by expressions like test ? NULL : ptr_to_const_char test ? ".." : ptr_to_const_char that the PGI compiler handles incorrectly. It chooses the pointer type of the first option (either void* or char*) and warns about conversion of the second without a cast. Flip the expression logic to !test ? ptr_to_const_char : NULL !test ? ptr_to_const_char : ".." to help the compiler choose the proper result type.
| * | | | libarchive: Suppress PathScale compiler warningsBrad King2012-01-041-0/+2
| | | | | | | | | | | | | | | | | | | | We are not developing libarchive so we do not care about warnings.
| * | | | libarchive: Rename isoent_rr_move_dir parameter isoent => curentBrad King2012-01-041-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | The PGI compiler confuses parameter name "isoent" with "struct isoent". Rename the parameter to "curent" to avoid confusion.
| * | | | libarchive: Include linux/types.h before linux/fiemap.hBrad King2012-01-043-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Some Linux API versions do not perform this inclusion automatically, so types like __u64 needed by the latter are not available.
| * | | | libarchive: Define _XOPEN_SOURCE=500 on HP-UXBrad King2012-01-041-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HP-UX <wchar.h> header provides 'mbstate_t' in C89/C90 mode only if _XOPEN_SOURCE is defined to exactly 500. Type 'mbstate_t' was introduced in C89/C90 Normative Amendment 1, aka C94/C95, adding support international character sets. It is part of C99 but not C89/C90.
| * | | | libarchive: Cleanup after ZLIB_WINAPI checkBrad King2012-01-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Clear CMAKE_REQUIRED_(INCLUDES|LIBRARIES) so that the rest of the checks after this one do not try to link zlib.
| * | | | libarchive: Remove hard-coded build configurationBrad King2012-01-031-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | Do not set CMAKE_BUILD_TYPE to Debug. Use the configuration specified by the user.
| * | | | libarchive: Use Apple copyfile.h API only if availableBrad King2012-01-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Do not use the copyfile.h API if the header is not available. The Mac SDK for older OS X versions does not provide it.
| * | | | libarchive: Do not use MNT_NOATIME if not definedBrad King2012-01-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Use the same pattern already used elsewhere in archive_read_disk_posix.c for ST_NOATIME to use MNT_NOATIME only when defined.
| * | | | libarchive: Check for 'struct statvfs' member 'f_iosize'Brad King2011-12-233-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Configure the result as definition HAVE_STRUCT_STATVFS_F_IOSIZE and use the member only if it exists. At least one platform (IRIX) provides struct statvfs without this member.
| * | | | libarchive: Do not use ST_NOATIME if not definedBrad King2011-12-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Use the same pattern already used elsewhere in archive_read_disk_posix.c to use ST_NOATIME only when defined.
| * | | | libarchive: Fix var decl after statement in archive_string.cBrad King2011-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | When HAVE_MBRTOWC is true we declare an extra local variable. Move the unused argument cast to the end of the invalid_mbs function.
| * | | | libarchive: Suppress compiler warningsBrad King2011-12-232-1/+10
| | | | | | | | | | | | | | | | | | | | We are not developing libarchive so we do not care about warnings.
| * | | | libarchive: Fix Windows NT API usage in VS 6Brad King2011-12-232-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VS 6 warns verbosely when WINVER >= 0x0500. Avoid defining WINVER and _WIN32_WINNT to higher than 0x0400 on VS 6. Provide missing API declarations in archive_windows.h when we do not get them from <windows.h>. Provide GetVolumePathNameW because VS 6 does not declare it regardless of the API version.
| * | | | libarchive: Cast mode constants to mode_t in case it is signedBrad King2011-12-231-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least one compiler (Borland) defines mode_t as just "short" which is signed. This breaks code like switch(archive_entry_filetype(e)) { case AE_IFREG: ... } if AE_IFREG and other constants have a longer signed type (int) because sign extension of the mode_t return type from archive_entry_filetype changes its value. Avoid the problem by ensuring the type of the constants matches mode_t. This change was originally made in commit a73acfbe (Fix for mode_t with signed types, 2009-11-07). Port it to the new libarchive snapshot.
| * | | | libarchive: Clean up configuration within CMake buildBrad King2011-12-231-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Require ZLIB but skip LZMA and XML support. Mark ZLIB and ICONV cache variables advanced.
| * | | | libarchive: Workaround case-insensitive symbols on BorlandBrad King2011-12-231-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mangle the open_FILE symbols to avoid conflict with open_file: Warning: public '_archive_read_open_file' in module 'archive_read_open_filename.c' clashes with prior module 'archive_read_open_file.c' Warning: public '_archive_write_open_file' in module 'archive_write_open_filename.c' clashes with prior module 'archive_write_open_file.c' This workaround should not go upstream because it will break when mixing compilers.
| * | | | libarchive: Cast constants to int64_t instead of using LL suffixBrad King2011-12-232-2/+2
| | | | | | | | | | | | | | | | | | | | The LL suffix is not portable. Use an explicit cast instead.
| * | | | libarchive: Declare mbstate_t and wcrtomb for BorlandBrad King2011-12-231-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | The Borland C++ 5.81 runtime library provides wcrtomb but only the C++ header <cwchar> actually declares the API.
| * | | | libarchive: Implement custom lseek for BorlandBrad King2011-12-232-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Restore Windows 64-bit lseek removed by upstream svn revision 3826 (Cast away __la_lseek(), use _lseeki64() instead, 2011-11-21). We need it on Borland.
| * | | | libarchive: Fix typo in CheckFileOffsetBitsBrad King2011-12-231-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | Replay commit 41719b75 (fix typo in CheckFileOffsetBits.cmake, 2011-10-05) after import of new libarchive snapshot.
| * | | | libarchive: Port to OSF operating systemBrad King2011-12-234-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make changes equivalent to those originally made by commits bd56626a (Fixes for the OSF operating system build, 2010-09-08) 92c082b1 (Add a fix for the inline keyword on the osf os, 2010-09-10) but based on the updated libarchive snapshot.
| * | | | libarchive: Install COPYING with CMake documentationBrad King2011-12-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Replay commit d39aee48 (Install COPYING with CMake documentation, 2011-06-16) after import of new libarchive snapshot.
| * | | | Configure libarchive build within CMakeBrad King2011-12-231-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Re-enable the option to build libarchive within CMake now that we have imported a new snapshot. Force libarchive ENABLE_* cache options to the values CMake needs. Set ENABLE_OPENSSL based on CMAKE_USE_OPENSSL to preserve the behavior introduced in commit ee55a4f7 (Use OpenSSL only if CMAKE_USE_OPENSSL, 2011-02-08).
| * | | | Handle libarchive API change in archive_read_data_blockBrad King2011-12-221-0/+4
| | | | | | | | | | | | | | | | | | | | The offset argument type depends on the libarchive version.
| * | | | libarchive: Include cm_zlib.h to get zlib used by CMakeBrad King2011-12-2212-12/+12
| | | | |
| * | | | libarchive: Build one static cmlibarchive for CMakeBrad King2011-12-221-21/+3
| | | | | | | | | | | | | | | | | | | | | | | | | CMake needs only a single static libarchive library and not a shared one. Call it cmlibarchive to avoid confusion.
| * | | | libarchive: Remove -Wall -Werror from build with GNUBrad King2011-12-221-8/+0
| | | | | | | | | | | | | | | | | | | | | | | | | We are not developing new libarchive features. Furthermore -Werror can break some try_compile cases.
| * | | | libarchive: Do not build subdirectories not in reduced snapshotBrad King2011-12-222-17/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove add_subdirectory() calls for directories not included in the reduced libarchive snapshot. Remove options that configure settings in the missing directories.