summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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.
| * | | | 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 5.0.5-gb69900ed (reduced)liblzma upstream2014-07-21148-0/+26264
| | / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream liblzma using the following shell code. url=http://git.tukaani.org/xz.git && v=5.0.5 && r=b69900ed && paths=" COPYING src/common/common_w32res.rc src/common/sysdefs.h src/common/tuklib_integer.h src/liblzma " && mkdir liblzma-$v-g$r-reduced && git clone $url liblzma-git && date=$(cd liblzma-git && git log -n 1 --format='%cd' $r) && (cd liblzma-git && git archive --format=tar $r -- $paths) | (cd liblzma-$v-g$r-reduced && tar xv && mv src/* . && rmdir src) && echo "g$r date: $date"
| * | | | liblzma: Add .gitattributes to ignore whitespace checksBrad King2014-07-211-0/+1
| | | | | | | | | | | | | | | | | | | | Tell Git not to check whitespace in third-party code.
* | | | | CMake Nightly Date StampKitware Robot2014-07-291-1/+1
| |_|_|/ |/| | |
* | | | Merge branch 'release'Brad King2014-07-280-0/+0
|\ \ \ \
| * \ \ \ Merge branch 'backport-kwsys-qnx-fix' into releaseBrad King2014-07-171-1/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'compile-with-cray' into releaseBrad King2014-07-171-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-QCC-compile-flags' into releaseBrad King2014-07-176-27/+41
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge topic 'sanitizer_handle_more_pids'Brad King2014-07-283-11/+27
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d40d88e Handle more than one process with sanitizer errors.
| * | | | | | | | Handle more than one process with sanitizer errors.Bill Hoffman2014-07-243-11/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the Sanitizers write out one log file per process, a single test might have more than one log file. This commit allows ctest to read all of the log files found for a particual test.
* | | | | | | | | Merge topic 'fix-re-cmake-with-compiler'Brad King2014-07-282-5/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8981513a CMakeDetermineCompiler: Simplify CMAKE_<LANG>_COMPILER default force-cache 731427a6 cmGlobalGenerator: Do not re-add CMAKE_<LANG>_COMPILER
| * | | | | | | | | CMakeDetermineCompiler: Simplify CMAKE_<LANG>_COMPILER default force-cacheBrad King2014-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If find_program does not find CMAKE_<LANG>_COMPILER, use set_property() to force the value to be that of CMAKE_<LANG>_COMPILER_INIT instead of set(). This allows us to set the value without re-specifying the type and documentation, thus preserving what find_program set.
| * | | | | | | | | cmGlobalGenerator: Do not re-add CMAKE_<LANG>_COMPILERBrad King2014-07-241-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The cmGlobalGenerator::ResolveLanguageCompiler method, invoked only by Makefile generators, contains code originally added by commit v2.4.0~796 (..., add new generators for msys and mingw, 2005-12-22) to compute the full path to the compiler and save the result back into the cache value. Since then the CMakeDetermine*Compiler modules have learned to resolve the full path to the compiler and save it in CMake*Compiler.cmake files configured in the build tree. The value of CMAKE_<LANG>_COMPILER in the cache is now only for reference of what the user originally specified. The full path is now available in a normal variable of the same name, and this is used by project code and the generators. When the user specifies -DCMAKE_<LANG>_COMPILER=name on the command-line of an existing build tree that uses a Makefile generator, it is first stored in the cache with an uninitialized type. Then later when ResolveLanguageCompiler updates the cache entry and sets the type to FILEPATH, cmMakefile::AddCacheDefinition does CollapseFullPath on the "name" and ends up with something like "$PWD/name" which is unlikely to be correct. Furthermore, cmMakefile::AddCacheDefinition proceeds to remove the normal variable of the same name, so the value originally saved in CMake<LANG>Compiler.cmake is ignored and the generators use the wrong path to the compiler. Resolve this by dropping the code from ResolveLanguageCompiler that touches the cache value of CMAKE_<LANG>_COMPILER. As explained above it is no longer needed anyway.
* | | | | | | | | | Merge topic 'fix_qt4_automoc_leak'Brad King2014-07-281-0/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e88b1d6 Fix memory leak of local generator detected by LeakSanitizer.
| * | | | | | | | | | Fix memory leak of local generator detected by LeakSanitizer.Bill Hoffman2014-07-241-0/+1
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge topic 'cpack-ifw-generator'Brad King2014-07-2814-0/+1411
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b9be4d21 Help: Add notes for topic 'cpack-ifw-generator' 73b336c9 CPackIFW: Replace use of strftime with cmTimestamp 44850a26 CPack: Add an "IFW" generator for Qt Framework Installer
| * | | | | | | | | | Help: Add notes for topic 'cpack-ifw-generator'Brad King2014-07-281-0/+5
| | | | | | | | | | |
| * | | | | | | | | | CPackIFW: Replace use of strftime with cmTimestampBrad King2014-07-281-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The latter is more portable.
| * | | | | | | | | | CPack: Add an "IFW" generator for Qt Framework InstallerKonstantin Podsvirov2014-07-2813-0/+1413
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for packaging with the Qt Framework Installer tools: http://qt-project.org/doc/qtinstallerframework/index.html Reviewed-by: Nils Gladitz <nilsgladitz@gmail.com>
* | | | | | | | | | | Merge topic 'FindImageMagick-arch-include-dir'Brad King2014-07-281-2/+26
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1342e022 FindImageMagick: Provide per-component include dirs (#15007) 6f5581c1 FindImageMagick: Find arch include dir (#15007)
| * | | | | | | | | | | FindImageMagick: Provide per-component include dirs (#15007)Brad King2014-07-231-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the ImageMagick_<component>_INCLUDE_DIRS variable that is mentioned in the documentation but was not set before.
generated by cgit v0.12 at 2025-01-08 14:11:03 (GMT)