summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* libarchive: Add README-CMake.txtBrad King2011-12-221-0/+66
| | | | Describe how to update libarchive from upstream.
* libarchive: Add .gitattributes for indentation with tabBrad King2011-12-221-0/+2
|
* Merge branch 'libarchive-upstream' into update-libarchiveBrad King2011-12-20164-0/+100292
|\ | | | | | | | | Add Utilities/cmlibarchive using upstream libarchive 3.0.0-r3950 snapshot.
| * libarchive 3.0.1-r3950 (reduced)LibArchive Upstream2011-12-20164-0/+100292
| | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream libarchive using the following shell code. url=https://libarchive.googlecode.com/svn/trunk v=3.0.1 r=3950 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: Remove our copy to make room for new importBrad King2011-12-20369-125904/+1
|
* KWSys Nightly Date StampKWSys Robot2011-12-201-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-12-191-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-12-181-1/+1
|
* KWSys Nightly Date StampKWSys Robot2011-12-171-1/+1
|
* Merge topic 'GNU-to-MS'David Cole2011-12-161-1/+1
|\ | | | | | | | | c213eb9 Windows-GNU: Remove extra quotes in GNUtoMS rule variable
| * Windows-GNU: Remove extra quotes in GNUtoMS rule variableBrad King2011-12-081-1/+1
| | | | | | | | | | CMake replaces the <TARGET...> tokens with properly quoted values so we do not need an extra set of quotes around them.
* | Merge topic 'qtdialog-quit'David Cole2011-12-161-0/+2
|\ \ | | | | | | | | | | | | 56e0499 QtDialog: Set Ctrl+Q as the shortcut for quitting the program.
| * | QtDialog: Set Ctrl+Q as the shortcut for quitting the program.Raphael Kubo da Costa2011-12-151-0/+2
| | | | | | | | | | | | | | | | | | QKeySequence::Quit does not work on all platforms, and since it translates to Ctrl+Q on all platforms where it does work, Ctrl+Q was hardcoded instead.
* | | Merge topic 'intel-error-regex-issue-12627'David Cole2011-12-161-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 56f29f4 CTest: Recognize Intel errors without space before colon (#12627)
| * | | CTest: Recognize Intel errors without space before colon (#12627)Brad King2011-12-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the regex meant to match errors of the form: C:\some\dir\source.cpp(17): catastrophic error: could not open source file "some_header.h" to make the space between ')' and ':' optional.
* | | | Merge topic 'test-Fortran-compiler-compat'David Cole2011-12-161-10/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fcb2a27 Fix and simplify Fortran test compiler compatibility check
| * | | | Fix and simplify Fortran test compiler compatibility checkBrad King2011-12-151-10/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 38aab379 (Set CMAKE_<lang>_COMPILER_ID for VS generators, 2011-09-02) the VS IDE generators set the C and C++ compiler id to MSVC and the Fortran compiler id to Intel. This caused the Fortran test to fail compatible compiler detection because the if() test "${CMAKE_C_COMPILER_ID}" MATCHES "MSVC" is evaluated as the "var MATCHES regex" signature which evaluates the compiler id "MSVC" as a variable which is defined to 1 which does not match "MSVC". Combine tests for non-identical but compatible compiler vendors into a single regex match whose left hand side will not be defined as a variable.
* | | | Merge topic 'remove-old-QtDialog-readme'David Cole2011-12-161-3/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 470bcfa Remove the apparently outdated README in Source/QtDialog.
| * | | | Remove the apparently outdated README in Source/QtDialog.Raphael Kubo da Costa2011-12-151-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Qt has been LGPL-licensed for a few years, so the clause mentioning only developers with a paid Qt license can change the code seems to be outdated.
* | | | | Merge topic 'test-compiler-output-var'David Cole2011-12-162-8/+11
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5f6985a Avoid clobbering variable 'OUTPUT' in compiler tests (#12628)
| * | | | | Avoid clobbering variable 'OUTPUT' in compiler tests (#12628)Brad King2011-12-152-8/+11
| | |/ / / | |/| | | | | | | | | | | | | Use an obscure name and clean up afterwards.
* | | | | Merge topic 'osx-dependent-libraries'David Cole2011-12-162-6/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5d99343 Do not link private dependent shared libraries on OS X > 10.4
| * | | | | Do not link private dependent shared libraries on OS X > 10.4Brad King2011-12-152-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default OS X 10.4 linker incorrectly searches for dependencies of linked shared libraries only under the -isysroot location. It fails to find dependencies of linked shared libraries in cases such as the ExportImport test. It produces errors like: /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: warning can't open dynamic library: libtestLib3Imp.dylib referenced from: /.../ExportImport/Root/lib/libtestLib3lib.1.2.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2) /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: Undefined symbols: _testLib3Imp referenced from libtestLib3lib expected to be defined in libtestLib3Imp.dylib or with CMAKE_SKIP_RPATH off to enable install_name in the Export side: /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: warning can't open dynamic library: /Developer/SDKs/MacOSX10.4u.sdk/.../ExportImport/Export/impl/libtestLib3Imp.dylib referenced from: /.../ExportImport/Export/libtestLib3lib.1.2.dylib (checking for undefined symbols may be affected) (No such file or directory, errno = 2) /usr/libexec/gcc/i686-apple-darwin8/4.0.1/ld: Undefined symbols:_testLib3Imp referenced from libtestLib3lib expected to be defined in /.../ExportImport/Export/impl/libtestLib3Imp.dylib Note how "/Developer/SDKs/MacOSX10.4u.sdk" is prepended to the dependent library path. Commit 2cff26fa (Support linking to shared libs with dependent libs, 2008-01-31) and commit 82fcaebe (Pass dependent library search path to linker on some platforms, 2008-02-01) worked around the problem by defining platform variable CMAKE_LINK_DEPENDENT_LIBRARY_FILES. It tells CMake to link to dependent libraries explicitly by their path thus telling the linker where to find them. Unfortunately the workaround had the side effect of linking dependent libraries and defeats most benefits of LINK_INTERFACE_LIBRARIES. Fortunately OS X 10.5 and above do not need to find transitive dependencies at all so we can avoid the workaround on Modern OS X.
* | | | | | Merge topic 'transitive-shared-lib-depend'David Cole2011-12-164-3/+27
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | 183b950 Follow all dependencies of shared library private dependencies
| * | | | | Follow all dependencies of shared library private dependenciesBrad King2011-12-144-3/+27
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmComputeLinkDepends we compute the transitive closure of private shared library dependencies. When a shared library is added to this closure we must follow all of its dependencies whether they are private or public. Previously we only followed the private dependencies. Fix the implementation to follow the public dependencies too. Also extend the ExportImport test to cover this case.
* | | | | Merge topic 'hp-shared-libs'David Cole2011-12-165-23/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5720e1f HP: Drive shared library linking with compiler front end
| * | | | | HP: Drive shared library linking with compiler front endBrad King2011-12-145-23/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we linked C, Fortran, and ASM shared libraries compiled with the HP compiler using a direct invocation of the linker (ld). This behavior was left historically from support for an ancient HP C compiler that did not know how to create shared libraries. Fortran shared libraries need to be linked with the compiler to get the language runtime library dependencies as is already done for C++. Update the HP-UX-HP* platform information to use the compiler front end when linking shared libraries. This works on modern HP tools and produces correct behavior. If there is a need to support older tools again we can add a special case for them.
* | | | | | Merge topic 'fix-12441-show-custom-target-progress'David Cole2011-12-161-0/+14
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7ab1162 CMake: Fix progress reporting for custom targets (#12441)
| * | | | | | CMake: Fix progress reporting for custom targets (#12441)Johan Fänge2011-12-141-0/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds "include progress.make" to build.make, just like for add_executable and add_library targets. The code was copied from cmMakefileTargetGenerator::WriteCommonCodeRules().
* | | | | | Merge topic 'fix-12480-correct-windres-compiler-when-cross-compiling'David Cole2011-12-161-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6ddb1e5 Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)
| * | | | | | Modules: Use "windres" as rc compiler base name for cross-compiles (#12480)David Cole2011-12-141-0/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...if it matches "windres", as opposed to being exactly equal to "windres" Cross-compiling windres compilers are named something like "i686-w64-mingw32-windres" (for example)
* | | | | | Merge topic 'vs-version-ivar'David Cole2011-12-161-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6571f46 Fix Intel Fortran .vfproj files for VS 10