summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'pdb-genex'Brad King2014-07-3114-34/+189
|\ | | | | | | | | | | f86850ef Genex: Implement generator expressions for target PDB files. 028ad318 Genex: Simplify filesytem artifact code
| * Genex: Implement generator expressions for target PDB files.Nils Gladitz2014-07-3114-0/+143
| |
| * Genex: Simplify filesytem artifact codeNils Gladitz2014-07-291-35/+47
| |
* | CMake Nightly Date StampKitware Robot2014-07-311-1/+1
| |
* | Merge branch 'release'Brad King2014-07-300-0/+0
|\ \
| * \ Merge branch 'FindQt4-more-plugins' into releaseBrad King2014-07-281-3/+3
| |\ \
| * \ \ Merge branch 'xcode-6-librarian-flags' into releaseBrad King2014-07-282-5/+24
| |\ \ \
* | \ \ \ Merge topic 'remove-link-remnants'Brad King2014-07-302-7/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 250ad08a Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
| * | | | | Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnantsNils Gladitz2014-07-292-7/+1
| | |_|_|/ | |/| | |
* | | | | Merge topic 'vs-refactor-source-tools'Brad King2014-07-302-21/+54
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0ac28adc VS: Map .jpg and .png sources to Image tool 58bb14d4 VS: Map .xml to XML tool 972cf1d7 VS: Map .appxmanifest sources to AppxManifest tool 15fb1022 VS: Refactor handling of resx headers c2ef6d23 VS: Refactor handling of "header" sources in VS >= 10 2df38911 VS: Refactor handling of "extra" sources in VS >= 10 143b4005 VS: Convert 'WriteSource' tool argument to std::string
| * | | | | VS: Map .jpg and .png sources to Image toolBrad King2014-07-291-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
| * | | | | VS: Map .xml to XML toolBrad King2014-07-291-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Gilles Khouzam <gillesk@microsoft.com>
| * | | | | VS: Map .appxmanifest sources to AppxManifest toolBrad King2014-07-291-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | Inspired-by: Minmin Gong <minmin.gong@gmail.com>
| * | | | | VS: Refactor handling of resx headersBrad King2014-07-291-14/+12
| | | | | | | | | | | | | | | | | | | | | | | | Move generation of the ClInclude element to WriteHeaderSource.
| * | | | | VS: Refactor handling of "header" sources in VS >= 10Brad King2014-07-292-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a WriteHeaderSource method to handle writing of sources classified by cmGeneratorTarget as header files. This will be useful to add special VS-specific handling for some headers.
| * | | | | VS: Refactor handling of "extra" sources in VS >= 10Brad King2014-07-292-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a WriteExtraSource method to handle writing of sources not classified by cmGeneratorTarget for any particular purpose. This will be useful to add special VS-specific handling for some sources.
| * | | | | VS: Convert 'WriteSource' tool argument to std::stringBrad King2014-07-292-6/+6
| | | | | |
* | | | | | Merge topic 'ExternalProject-add-lzma'Brad King2014-07-302-5/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 56e6975c ExternalProject: Recognize lzma-compressed files (#13515) 98ea0344 ExternalProject: Recognize .tbz2 extension
| * | | | | | ExternalProject: Recognize lzma-compressed files (#13515)Brad King2014-07-292-5/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add .7z, .tar.xz, and .txz file extensions. Inspired-by: Joke de Buhr <joke@seiken.de> Inspired-by: David Cole <DLRdave@aol.com>
| * | | | | | ExternalProject: Recognize .tbz2 extensionBrad King2014-07-291-5/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix .bz2 extension to be .tar.bz2 since we only support compressed tarballs and not plain compressed files. Suggested-by: Nils Gladitz <nilsgladitz@gmail.com> Suggested-by: Rolf Eike Beer <eike@sf-mail.de>
* | | | | | Merge topic 'cpack-add-lzma'Brad King2014-07-309-2/+151
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f931a18c CPack: add generators for .7z and .tar.xz (#13072, #14519)
| * | | | | | CPack: add generators for .7z and .tar.xz (#13072, #14519)Daniel Pfeifer2014-07-299-2/+151
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2014-07-301-1/+1
|/ / / / /
* | | | | Merge topic 'vs10-system-hook'Brad King2014-07-292-0/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e58f9753 VS: Add a hook to adapt to SystemName and SystemVersion d0dd28fa VS: Save system name and version in global generator members
| * | | | | VS: Add a hook to adapt to SystemName and SystemVersionBrad King2014-07-282-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a virtual cmGlobalVisualStudio10Generator::InitializeSystem method called from SetSystemName once the SystemName and SystemVersion members have been populated. This will give VS version-specific generators a chance to recognize and adapt to the target system.
| * | | | | VS: Save system name and version in global generator membersBrad King2014-07-282-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add to cmGlobalVisualStudio10Generator members for SystemName and SystemVersion and populate them in SetSystemName.
* | | | | | Merge topic 'vs10-comment-typo'Brad King2014-07-291-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99e14a38 cmGlobalVisualStudio10Generator: Fix typo KHLM => HKLM
| * | | | | | cmGlobalVisualStudio10Generator: Fix typo KHLM => HKLMGilles Khouzam2014-07-281-1/+1
| |/ / / / /
* | | | | | Merge topic 'windows-ce-cleanup'Brad King2014-07-293-5/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7079f33d WindowsCE: Drop unused Platform/WindowsCE-MSVC module 05373f7e WindowsCE: Refactor setting of "WINCE" 1acde6b0 MSVC: Use STREQUAL to check for WindowsCE
| * | | | | | WindowsCE: Drop unused Platform/WindowsCE-MSVC moduleBrad King2014-07-281-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This module was created to mirror Platform/Windows-MSVC.cmake, but this is not necessary because nothing includes "Platform/<os>-<id>.cmake" directly. The Platform/Windows-MSVC module is only a helper for the Platform/Windows-MSVC-<lang> modules.
| * | | | | | WindowsCE: Refactor setting of "WINCE"Brad King2014-07-282-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move it to the Platform/Windows module since it is independent of the compiler used. While at it, remove redundant "WIN32" setting from Platform/Windows-MSVC since Plaform/Windows already sets its.
| * | | | | | MSVC: Use STREQUAL to check for WindowsCEBrad King2014-07-281-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | In the Platform/Windows-MSVC module it is not necessary to use MATCHES because we are comparing against an exact string.
* | | | | | 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.
* | | | | | Merge topic 'xcode-6-librarian-flags'Brad King2014-07-292-5/+24
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | 608cf814 Xcode: Fix static library creation for Xcode 6 (#15038)
| * | | | | Xcode: Fix static library creation for Xcode 6 (#15038)Brad King2014-07-282-5/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 6 introduced an 'OTHER_LIBTOOLFLAGS' setting for the "Other Librarian Flags" of a static library. Now 'OTHER_LDFLAGS' are ignored. Teach the Xcode generator to choose the correct name for the build setting based on the type of target and the version of Xcode. Inspired-by: Jamie Kirkpatrick <jkp@spotify.com>
* | | | | | Merge topic 'doc-tll-flags'Brad King2014-07-291-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8c03f157 Help: Clarify target_link_libraries treatment of flags (#15034)
| * | | | | | Help: Clarify target_link_libraries treatment of flags (#15034)Brad King2014-07-281-1/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | Explain that link flags should not be used in transitive contexts.
* | | | | | Merge topic 'osx-no-sysroot-for-deployment'Brad King2014-07-291-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b4faeef OS X: Allow deployment target with "/" sysroot (#15040)
| * | | | | | OS X: Allow deployment target with "/" sysroot (#15040)Jeremy Huddleston2014-07-281-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow the combination -DCMAKE_OSX_DEPLOYMENT_TARGET="10.8" -DCMAKE_OSX_SYSROOT="/" to work. Treat the "/" sysroot as targeting the current OS X version.
* | | | | | | Merge topic 'FindQt4-more-plugins'Brad King2014-07-291-3/+3
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 4b5052b0 FindQt4: Add nativewifi and qtga plugins
| * | | | | | FindQt4: Add nativewifi and qtga pluginsMathieu MARACHE2014-07-281-3/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | While at it, update QT_QTGUI_PLUGINS to use QT_IMAGEFORMATS_PLUGINS instead of duplicating the list.
* | | | | | Merge topic 'add-liblzma'Brad King2014-07-29156-18/+26885
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65a0ea45 Help: Add notes for topic 'add-liblzma' 8436d181 CMake: Enable use of liblzma in libarchive (#14504) 73eab246 liblzma: Avoid defining a 'restrict' macro 90e7a4d4 liblzma: Disable warnings to avoid changing 3rd party code c20b4502 liblzma: Port to VS 6, 7.0 7a92eddb liblzma: Port from C99 to C89/90 b2a07ca4 liblzma: Add CMake build system d44ad161 liblzma: Remove unused Makefile.* files a53caea3 liblzma: Add README-CMake.txt 133d42fe Merge branch 'liblzma-upstream' into add-liblzma c289e634 liblzma 5.0.5-gb69900ed (reduced) 8510533f liblzma: Add .gitattributes to ignore whitespace checks
| * | | | | | Help: Add notes for topic 'add-liblzma'Brad King2014-07-291-0/+5
| | | | | | |
| * | | | | | CMake: Enable use of liblzma in libarchive (#14504)Daniel Pfeifer2014-07-2912-18/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
generated by cgit v0.12 at 2025-01-08 12:12:32 (GMT)