summaryrefslogtreecommitdiffstats
path: root/Utilities
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge topic 'fix-qthelp-windows'Brad King2014-07-291-2/+7
|\ | | | | | | | | 9e5e7e71 Help: Fix QtHelp commands on Windows
| * Help: Fix QtHelp commands on WindowsNils Gladitz2014-07-281-2/+7
| | | | | | | | | | | | | | Explicitly invoke python script through the interpreter since windows does not act on hashbangs. Use the found qcollectiongenerator executable rather than what happens to be in PATH.
* | CMake: Enable use of liblzma in libarchive (#14504)Daniel Pfeifer2014-07-2911-16/+45
| | | | | | | | | | Build liblzma as part of CMake or find one on the system. Modify our port of libarchive to use the liblzma configured for use with CMake.
* | liblzma: Avoid defining a 'restrict' macroBrad King2014-07-2931-101/+103
| | | | | | | | | | | | | | | | | | | | Any "#define restrict ..." line may conflict with MSVC header files that use "__declspec(restrict)". Define our own LZMA_RESTRICT macro in "Utilities/cmliblzma/config.h.in" and transform liblzma code to use it: git grep -lE '\<restrict\>' Utilities/cmliblzma/liblzma | xargs sed -i 's/\<restrict\>/LZMA_RESTRICT/g'
* | liblzma: Disable warnings to avoid changing 3rd party codeBrad King2014-07-292-1/+13
| |
* | liblzma: Port to VS 6, 7.0Daniel Pfeifer2014-07-292-17/+10
| | | | | | | | Also remove use of MSVC intrinsic.
* | liblzma: Port from C99 to C89/90Daniel Pfeifer2014-07-2961-700/+1080
| | | | | | | | | | Remove use of designated initializers and declarations of variables after statements. Leave "//" comments as-is for now.
* | liblzma: Add CMake build systemDaniel Pfeifer2014-07-237-8/+491
| | | | | | | | | | Modify sources just enough to build without the full xz common directory.
* | liblzma: Remove unused Makefile.* filesBrad King2014-07-239-387/+0
| | | | | | | | We will provide our own CMake-based build system.
* | liblzma: Add README-CMake.txtBrad King2014-07-231-0/+66
| | | | | | | | Describe how to update liblzma from upstream.
* | Merge branch 'liblzma-upstream' into add-liblzmaBrad King2014-07-21148-0/+26264
| |
* | liblzma: Add .gitattributes to ignore whitespace checksBrad King2014-07-211-0/+1
|/ | | | Tell Git not to check whitespace in third-party code.
* Merge topic 'identify-qthelp-artifacts'Brad King2014-07-181-7/+21
|\ | | | | | | | | 376ba935 Help: Identify more artifact types in QtHelp documentation.
| * Help: Identify more artifact types in QtHelp documentation.Stephen Kelly2014-07-171-7/+21
| | | | | | | | | | | | Add identifiers for variables, properties, policies and modules. This will allow QtCreator to show relevant documentation if it learns more about the context of the contents of cmake files.
* | Merge topic 'compile-with-cray'Brad King2014-07-171-1/+1
|\ \ | |/ |/| | | | | fd63722d cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)
| * cmcurl: Fix a build failure with the Cray compiler on Linux (#15026)Chuck Atkins2014-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | The error is caused by a workaround for UNICOS. The workaround incorrectly uses the _CRAYC macro to determine if building for UNICOS. This macro will always be defined for the Cray C and C++ compiler regardless of the target platform, even when building for Linux. The correct macro should be _CRAY, which as per Cray documentation is only defined for UNICOS targeted builds.
| * libarchive: fix compilation on newer HP-UX versionsRolf Eike Beer2014-06-091-12/+14
| | | | | | | | | | | | | | Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different struct for the timing information. Suggested-by: Eric Berge <ericmberge@gmail.com>
* | Help: Add context to titles in QtHelp.Stephen Kelly2014-06-171-0/+6
| | | | | | | | This allows disambiguation of identifiers in Qt Assistant and Creator.
* | Help: Create proper identifiers for keywords in QtHelp.Stephen Kelly2014-06-172-0/+37
| | | | | | | | | | | | | | | | | | This is necessary in order for the QHelpEngineCore::linksForIdentifier API to work. http://doc-snapshot.qt-project.org/qt5-5.3/qhelpenginecore.html#linksForIdentifier That API is used by QtCreator to enable contextual links to help files.
* | Merge topic 'hpux-libarchive-compile'Brad King2014-06-091-1/+1
|\ \ | | | | | | | | | | | | c1ddd77d libarchive: Fix compilation on Tru64 with F_SETTIMES
| * | libarchive: Fix compilation on Tru64 with F_SETTIMESBrad King2014-06-091-1/+1
| | | | | | | | | | | | | | | The parent commit left a typo in the conditional code path for Tru64. Add the missing '.'.
* | | Merge topic 'hpux-libarchive-compile'Brad King2014-06-091-12/+14
|\ \ \ | |/ / | | | | | | | | | 478b1c8b libarchive: fix compilation on newer HP-UX versions
| * | libarchive: fix compilation on newer HP-UX versionsRolf Eike Beer2014-06-091-12/+14
| |/ | | | | | | | | | | | | Newer HP-UX versions (e.g. 11.31) also offers F_SETTIMES, but with a different struct for the timing information. Suggested-by: Eric Berge <ericmberge@gmail.com>
* | Add an "installed file" property scopeNils Gladitz2014-05-281-0/+4
| | | | | | | | | | | | | | Teach set_property and get_property an "INSTALL" property type to be associated with install-tree file paths. Make the properties available to CPack for use during packaging. Add a "prop_inst" Sphinx domain object type for documentation of such properties.
* | OS X: Package with DragNDrop instead of PackageMakerBrad King2014-05-083-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the CPack DragNDrop generator instead of the deprecated PackageMaker tool to package CMake itself. This provides an installation experience that is more consistent with other products on OS X and allows users to select the destination directory easily. It also avoids installing "/private/var/db/receipts/com.Kitware.CMake.*" receipts that must be removed by "pkgutil --forget com.Kitware.CMake" before another version of CMake can be installed. The DragNDrop installer does not support a post-flight script, so drop our configuration of it. The cmake-gui has an option for installing symbolic links to enable command-line use. In practice users may simply add "/Applications/CMake.app/Contents/bin" to their PATH instead.
* | Utilities/Release: Use ${VAR} instead of @VAR@ syntaxBrad King2014-05-081-2/+2
| | | | | | | | | | The Utilities/Release/Cygwin/CMakeLists.txt is processed in the project, not configured, so we should avoid using @-replacement syntax.
* | Utilities/Release: Drop IRIX binary generation on ferrariBrad King2014-04-303-29/+0
| | | | | | | | | | | | | | | | This machine has been decommissioned. See also SGI announcements: SGI Support of MIPS IRIX Products Changes December 2013 https://www.sgi.com/services/support/irix_mips_support.html https://www.sgi.com/products/software/irix/
* | Merge branch 'master' into doc-singlehtmlBrad King2014-04-2473-2126/+4324
|\ \ | |/ |/| | | | | Resolve conflicts in Utilities/Sphinx/CMakeLists.txt by adding the help options from both sides.
| * Merge topic 'sphinx-python3'Brad King2014-04-241-1/+4
| |\ | | | | | | | | | | | | d55671ad Utilities/Sphinx: Fix cmake domain document removal with python3
| * \ Merge topic 'sphinx-python3'Brad King2014-04-182-4/+4
| |\ \ | | | | | | | | | | | | | | | | 69069cfb Utilities/Sphinx: Port documentation generation to python3 (#14886)
| * \ \ Merge topic 'update-libarchive'Brad King2014-04-1711-146/+197
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 67f5f0a9 libarchive: Use _snprintf on Windows, not snprintf fcfbb0a9 libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need it 61a649d9 libarchive: Update README-CMake.txt for new snapshot 4533560c Merge branch 'libarchive-upstream' into update-libarchive 44d6b82f libarchive: Disable all whitespace checks in third-party code 37f225b7 libarchive 3.1.2-246-ga5a5d28b (reduced) 6ab7c326 libarchive: Avoid left-shift overflow of signed integer
| | * | | libarchive: Use _snprintf on Windows, not snprintfBrad King2014-04-151-0/+4
| | | | |
| | * | | libarchive: Drop LIBARCHIVE_ADDITIONAL_LIBS, CMake does not need itBrad King2014-04-151-6/+0
| | | | |
| | * | | libarchive: Update README-CMake.txt for new snapshotBrad King2014-04-151-4/+4
| | | | |
| | * | | Merge branch 'libarchive-upstream' into update-libarchiveBrad King2014-04-159-139/+192
| | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflicts in Utilities/cmlibarchive/CMakeLists.txt as appropriate.
| | * | | libarchive: Disable all whitespace checks in third-party codeBrad King2014-04-151-1/+1
| | | | |
| | * | | libarchive: Avoid left-shift overflow of signed integerBrad King2014-04-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In libarchive/archive_write_set_format_zip.c there are two calls to archive_le32enc whose second argument is of the form archive_entry_mode(zip->entry) << 16 However, the return type from archive_entry_mode may be a signed integer so the shift may overflow. Since the second argument of archive_le32enc expects uint32_t anyway, simply cast to that prior to shifting.
| * | | | Utilities/Release: Update to openssl-1.0.1gBrad King2014-04-153-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | Update the prebuilt binary build configurations for machines where we build our own OpenSSL library to use a newer version.
| * | | | Merge topic 'libarchive-no-acl'Brad King2014-04-151-1/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | d9b59179 libarchive: Skip finding libacl.h when ENABLE_ACL is OFF (#14866)
| | * | | | libarchive: Skip finding libacl.h when ENABLE_ACL is OFF (#14866)Mike Crowe2014-04-141-1/+5
| | | | | |
| * | | | | Merge topic 'fix-qthelp-installation'Brad King2014-04-151-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | 6578508c Help: Fix installation of the Qt qch file.
| | * | | | Help: Fix installation of the Qt qch file.Stephen Kelly2014-04-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The file was changed to have the version in its name in commit 111bb67c (Help: Use a more-appropriate qthelp namespace and file name., 2014-04-10).
| * | | | | Merge topic 'update-libarchive'Brad King2014-04-1456-1953/+4002
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5a58efaa libarchive: Avoid using name 'u_long' e2b02823 Update libarchive configuration within CMake 80883321 libarchive: Do not require includers to have windows.h dfb0458e libarchive: Convert literal LL suffix to ARCHIVE_LITERAL_LL b0a9807f libarchive: Update archive_util.c to use CMake zlib and bzip2 headers debe4dec libarchive: Drop options not present in reduced version 66b0c4fa libarchive: Do not generate a pkg-config file 8092e759 libarchive: Update README-CMake.txt for new snapshot 2f197863 Merge branch 'libarchive-upstream' into update-libarchive 23e4666c libarchive: Disable more whitespace checks in third-party code 64713ae3 libarchive 3.1.2-218-g00f4bd83 (reduced)
| | * | | libarchive: Avoid using name 'u_long'Brad King2014-04-112-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | The system headers on some platforms define a 'u_long' type so we cannot use the name. Spell out 'unsigned long' instead.
| | * | | libarchive: Do not require includers to have windows.hBrad King2014-04-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In archive_entry.h refer to "BY_HANDLE_FILE_INFORMATION *" using "struct _BY_HANDLE_FILE_INFORMATION *" to avoid requiring the includer to already have <windows.h>.
| | * | | libarchive: Convert literal LL suffix to ARCHIVE_LITERAL_LLBrad King2014-04-031-16/+16
| | | | |
| | * | | libarchive: Update archive_util.c to use CMake zlib and bzip2 headersBrad King2014-04-031-2/+2
| | | | |
| | * | | libarchive: Drop options not present in reduced versionBrad King2014-04-031-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop ENABLE_TAR and ENABLE_CPIO related options because we do not build these command-line tools. Drop ENABLE_TEST and ENABLE_COVERAGE options because we do not build the tests.
| | * | | libarchive: Do not generate a pkg-config fileBrad King2014-04-031-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | CMake does not install the headers or libraries so skip the .pc file too.
| | * | | libarchive: Update README-CMake.txt for new snapshotBrad King2014-04-031-4/+4
| | | | |