summaryrefslogtreecommitdiffstats
path: root/Utilities
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'require-CMake-2.8.2'David Cole2012-05-011-1/+1
|\ | | | | | | | | d960de2 Require CMake 2.8.2 or higher to build CMake
| * Require CMake 2.8.2 or higher to build CMakeBrad King2012-04-261-1/+1
| | | | | | | | | | | | | | | | | | Update the requirement specified in the top-level CMakeLists.txt file. Drop the special-case minimum required version of 2.8.0 because the new minimum subsumes it. Revert commit 6c611c6b (libarchive: Restore CMake 2.6.3 as minimum version, 2012-01-05) since our requirement now subsumes libarchive's.
* | Merge topic 'developer-setup'David Cole2012-05-011-10/+36
|\ \ | |/ |/| | | | | | | c9072f8 Merge branch 'setup' into developer-setup b7daff9 setup-stage: Optionally reconfigure topic stage
| * Merge branch 'setup' into developer-setupBrad King2012-04-261-10/+36
| |
* | Merge topic 'compile-XL-v6'David Cole2012-04-252-5/+8
|\ \ | | | | | | | | | | | | | | | | | | b3c7788 Workaround IBM XL v6 streams seekg bug (#13149) 09a91c6 libarchive: Avoid 'inline' keyword on XL C v6 (#13148) a8995eb libarchive: Avoid trailing , in enum for XL v6 (#13148)
| * | libarchive: Avoid 'inline' keyword on XL C v6 (#13148)Brad King2012-04-191-0/+3
| | |
| * | libarchive: Avoid trailing , in enum for XL v6 (#13148)Jim Hague2012-04-191-5/+5
| | | | | | | | | | | | IBM xlc v6 cannot cope with a trailing ',' in enum definitions.
* | | Merge branch 'developer-setup'Brad King2012-04-1914-0/+803
|\ \ \ | |/ / |/| / | |/
| * Exclude from CMake source archives files specific to Git work treeBrad King2012-03-021-0/+2
| | | | | | | | | | Add the "export-ignore" attribute to SetupForDevelopment.sh and the Git/ hooks directory.
| * Merge branch 'setup' into developer-setupBrad King2012-03-022-7/+3
| |
| * Add and configure developer setup helper scriptsBrad King2012-03-022-0/+22
| | | | | | | | | | Configure GitSetup scripts for CMake. Run them from a single Utilities/SetupForDevelopment.sh script.
| * Merge branch 'setup' into developer-setupBrad King2012-03-0211-0/+783
| | | | | | | | | | Add Utilities/GitSetup/ directory using subtree merge from the general GitSetup repository "setup" branch.
* | Merge branch 'upstream-kwiml' into update-KWIMLBrad King2012-03-201-6/+6
| |
* | Merge topic 'update-KWIML'Brad King2012-03-131-17/+29
|\ \ | | | | | | | | | | | | | | | 289e5e6 Merge branch 'upstream-kwiml' into update-KWIML f94ae0e KWIML: Make test_INT robust to #define-d int#_t and INT#_C
| * | Merge branch 'upstream-kwiml' into update-KWIMLBrad King2012-03-091-17/+29
| | |
* | | Merge topic 'fix-cygwin-hint-file'David Cole2012-03-081-4/+4
|\ \ \ | |/ / |/| | | | | | | | | | | 208c3f8 Use correct "requires" line in cygwin setup hint file 1b996e7 Remove trailing white space
| * | Use correct "requires" line in cygwin setup hint fileDavid Cole2012-03-061-1/+1
| | | | | | | | | | | | | | | Reference: email thread between Bill Hoffman and Yaakov Selkowitz from Mar. 5, 2012.
| * | Remove trailing white spaceDavid Cole2012-03-061-3/+3
| |/
* | cmcurl: Do not hard-coded Windows check results for MinGW (#13001)Brad King2012-03-021-2/+2
|/ | | | | | The WindowsCache.cmake file hard-codes results for MS and similar Windows toolchains. They are not valid for MinGW tools and also interfere with cmlibarchive checks. Allow the checks to run.
* Merge topic 'HandleTargetsInCMakeRequiredLibraries'David Cole2012-02-211-19/+14
|\ | | | | | | | | | | | | | | 35c48e1 Check*.cmake: Expand imported targets in CMAKE_REQUIRED_LIBRARIES 61cb4ea bootstrap: move while() and endwhile() into the bootstrap build c9f2886 -don't pull in CheckTypeSize.cmake from the cmake which is being built 628f365 -remove trailing whitespace
| * -don't pull in CheckTypeSize.cmake from the cmake which is being builtAlex Neundorf2012-02-211-6/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We can be sure that at least cmake 2.6.3 is used when building cmcurl. This means we always get in the first branch of the if(). I think it is not a good idea to pull a cmake module from the cmake which is being built in, since this may use features which are not supported in the cmake which is used to build cmake (e.g. CMAKE_CURRENT_LIST_DIR which does not exist in cmake 2.6.3 which is the minimum for cmcurl). A bit further below there is anyway code to handle the case that cmake is older than 2.8.0, so it should be ok. Alex
| * -remove trailing whitespaceAlex Neundorf2012-02-211-13/+13
| | | | | | | | Alex
* | Merge topic 'update-KWIML'David Cole2012-02-211-1/+9
|\ \ | | | | | | | | | | | | | | | 4cbc21e Merge branch 'upstream-kwiml' into update-KWIML aabf65a KWIML: Teach ABI.h that MIPS is biendian
| * | Merge branch 'upstream-kwiml' into update-KWIMLBrad King2012-02-201-1/+9
| | |
* | | Merge topic 'libarchive-old-glibc'David Cole2012-02-141-0/+5
|\ \ \ | | | | | | | | | | | | | | | | ca77902 libarchive: Workaround mbsnrtowcs assertion failure on old glibc
| * | | libarchive: Workaround mbsnrtowcs assertion failure on old glibcBrad King2012-02-101-0/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CMake TarTest fails with the error mbsnrtowcs.c:116: __mbsnrtowcs: Assertion `status == GCONV_OK || status != GCONV_EMPTY_INPUT || status == GCONV_ILLEGAL_INPUT || status == GCONV_INCOMPLETE_INPUT || status == GCONV_FULL_OUTPUT' failed. on very old glibc versions. Work around the problem by pretending that mbsnrtowcs does not exist. Libarchive will fall back to mbrtowc.
* | | Merge topic 'change_qmake_path'David Cole2012-02-141-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 9fb9416 Use upgraded qt on linux build machine.
| * | | Use upgraded qt on linux build machine.Bill Hoffman2012-02-101-1/+1
| | | |
* | | | Add CURL_CA_BUNDLE option for SSL support (#12946)Artur Kedzierski2012-02-091-0/+5
|/ / / | | | | | | | | | | | | This adds the ability to specify the location of SSL CA bundle at compile time.
* | | Update version of Qt for dashmacmini5 produced release binariesDavid Cole2012-02-061-1/+1
| | | | | | | | | | | | Use 4.8.0
* | | Update dashmacmini2 release script to use Qt 4.8.0David Cole2012-01-311-1/+1
| | |
* | | Update dashmacmini2 release script to use Qt 4.6.3David Cole2012-01-171-2/+2
|/ /
* | Include bzlib.h consistently across CMake build (#10950)Brad King2012-01-138-6/+30
| | | | | | | | | | | | | | | | | | Use the approach originally used in commit f91b3c1d (Add options to build with system utility libraries, 2006-10-19) for all other third-party libraries. Create a "cm_bzlib.h" header wrapper that robustly includes the header from the bzip2 library chosen for the CMake build (either builtin or system version). Include the header wrapper anywhere we need the API provided by <bzlib.h>.
* | Merge topic 'update-libarchive'David Cole2012-01-09434-112675/+87204
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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: 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.