summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cpack-add-lzma'Brad King2014-07-308-2/+146
|\ | | | | | | | | f931a18c CPack: add generators for .7z and .tar.xz (#13072, #14519)
| * CPack: add generators for .7z and .tar.xz (#13072, #14519)Daniel Pfeifer2014-07-298-2/+146
| |
* | 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 '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>
* | | CMake Nightly Date StampKitware Robot2014-07-291-1/+1
| |/ |/|
* | Merge topic 'sanitizer_handle_more_pids'Brad King2014-07-282-11/+20
|\ \ | | | | | | | | | | | | 5d40d88e Handle more than one process with sanitizer errors.
| * | Handle more than one process with sanitizer errors.Bill Hoffman2014-07-242-11/+20
| | | | | | | | | | | | | | | | | | 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-281-4/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | 8981513a CMakeDetermineCompiler: Simplify CMAKE_<LANG>_COMPILER default force-cache 731427a6 cmGlobalGenerator: Do not re-add CMAKE_<LANG>_COMPILER
| * | | 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-286-0/+969
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | 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-286-0/+976
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'vs-escaping'Brad King2014-07-286-65/+89
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 09164c63 VS: Encode more content correctly in vcxproj files (#15031) 29a0642b VS: Encode mapped flag values in XML project files (#15031) 8fa087ab cmVisualStudioGeneratorOptions: Simplify XML escaping API 1c209ac1 cmIDEOption: Store mapped flag values as a vector<string> 91c93354 cmVisualStudio10TargetGenerator: Remove dupilcate line
| * | | | | VS: Encode more content correctly in vcxproj files (#15031)Brad King2014-07-231-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmVisualStudio10TargetGenerator, add missing cmVS10EscapeXML calls around paths to source and object files, custom command dependencies and outputs, and platform name/version values.
| * | | | | VS: Encode mapped flag values in XML project files (#15031)Brad King2014-07-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach cmVisualStudioGeneratorOptions to encode FlagMap entries and the FlagString value properly in vcproj/vcxproj XML files. Update the one existing call site that pre-encoded the value to not do so.
| * | | | | cmVisualStudioGeneratorOptions: Simplify XML escaping APIBrad King2014-07-231-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | Accept arguments as std::string to avoid c_str() calls.
| * | | | | cmIDEOption: Store mapped flag values as a vector<string>Brad King2014-07-235-41/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some FlagMap entries are ;-lists. Store values as vector<string> so that individual values may contain ';' characters. Delay the construction of the final ;-list until writing to the VS project file. With this approach the generated file may contain ;-separated values that contain encoded ';' characters.
| * | | | | cmVisualStudio10TargetGenerator: Remove dupilcate lineBrad King2014-07-231-1/+0
| | |_|/ / | |/| | |
* | | | | Merge topic 'fix_tar_leaks'Brad King2014-07-281-0/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 57a2df22 Fix memory leaks in extract tar.
| * | | | | Fix memory leaks in extract tar.Bill Hoffman2014-07-231-0/+3
| |/ / / /
* | | | | Merge topic 'genex-head-sensitive-conditions'Brad King2014-07-286-76/+148
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b743a2e cmTarget: Avoid re-computing head-independent link interfaces 807e4ffe Genex: Track whether an expression depends on the 'head' target 46099b82 cmTarget: Move ComputeLinkImplementation* to internals 438d9c7c cmTarget: Re-order link interface map lookup logic fe665fdd cmTarget: Refactor link interface map storage 9d13e167 cmTarget: Remove duplicate link interface map
| * | | | | cmTarget: Avoid re-computing head-independent link interfacesBrad King2014-07-212-8/+55
| | | | | |
| * | | | | Genex: Track whether an expression depends on the 'head' targetBrad King2014-07-214-0/+23
| | | | | |
| * | | | | cmTarget: Move ComputeLinkImplementation* to internalsBrad King2014-07-212-35/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no external callers, and this will allow the methods to see the full OptionalLinkImplementation internal structure.
| * | | | | cmTarget: Re-order link interface map lookup logicBrad King2014-07-211-16/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In GetLinkInterface, GetLinkInterfaceLibraries, and GetImportLinkInterface, lookup the HeadToLinkInterfaceMap for the current configuration first, and then index it by head target. In GetLinkImplementationLibrariesInternal, lookup the HeadToLinkImplementationMap for the current configuration first, and then index it by head target.
| * | | | | cmTarget: Refactor link interface map storageBrad King2014-07-211-18/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert LinkInterfaceMapType and LinkImplMapType to nested maps that index on configuration first and 'head' target second.
| * | | | | cmTarget: Remove duplicate link interface mapBrad King2014-07-211-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No target is both imported and not imported so we do not need separate link interface maps for them.
* | | | | | Merge topic 'target-drop-build-setting-cache'Brad King2014-07-281-254/+126
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | 133cd996 cmTarget: Drop internal cache of build properties a4d58722 cmTarget: Drop internal cache of link interface usage requirements
| * | | | | cmTarget: Drop internal cache of build propertiesBrad King2014-07-211-91/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These use a huge amount of memory that accumulates as generation proceeds. On the Unix Makefiles generator, only GetIncludeDirectories and GetCompileDefinitions are even called more than once per target (once for build files, once for dependency scanning preprocessor info). Another approach will be needed to avoid duplicate computation in the cases where it does occur.
| * | | | | cmTarget: Drop internal cache of link interface usage requirementsBrad King2014-07-211-163/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These use a huge amount of memory that accumulates as generation proceeds. On the Unix Makefiles generator, only GetIncludeDirectories and GetCompileDefinitions are even called more than once per target (once for build files, once for dependency scanning preprocessor info). Another approach will be needed to avoid duplicate computation in the cases where it does occur.
* | | | | | CMake Nightly Date StampKitware Robot2014-07-281-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-07-271-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-07-261-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-07-251-1/+1
| |_|_|/ / |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2014-07-241-1/+1
| |/ / / |/| | |
* | | | Merge topic 'refactor-makerule-path-conversion'Brad King2014-07-2310-35/+40
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 848fab95 cmGlobalVisualStudio7Generator: Remove unused variable 85cea8a7 cmDepends: Refactor object file path conversion e7ee892b cmLocalGenerator: Fix AddBuildTargetRule object file path conversion 9f92a78b cmLocalGenerator: Rename 'MAKEFILE' to 'MAKERULE'
| * | | | cmGlobalVisualStudio7Generator: Remove unused variableBrad King2014-07-221-1/+0
| | | | |
| * | | | cmDepends: Refactor object file path conversionBrad King2014-07-223-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Delay conversion of the path to object files (on the left-hand side of dependencies) until just before they are written. Also do not convert the format of paths written to the 'depend.internal' file. This is consistent with the way the right-hand side of dependencies are already handled.
| * | | | cmLocalGenerator: Fix AddBuildTargetRule object file path conversionBrad King2014-07-221-1/+1
| | | | | | | | | | | | | | | | | | | | The object file list is constructed for a shell, not a Makefile rule.
| * | | | cmLocalGenerator: Rename 'MAKEFILE' to 'MAKERULE'Brad King2014-07-229-18/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Rename the internal enumeration value for converting paths destined for use in Makefile rule syntax.
* | | | | Merge topic 'refactor-generator-startup'Brad King2014-07-2310-35/+22
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | f5c0efdb cmGlobalGenerator: Create a non-virtual 'DoGenerate' method
| * | | | cmGlobalGenerator: Create a non-virtual 'DoGenerate' methodBrad King2014-07-2210-35/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make the virtual 'Generate' method protected. Make 'DoGenerate' the main entry point to generation. This gives cmGlobalGenerator a chance to do some early operations before the individual generator-specific implementations take over.
generated by cgit v0.12 at 2025-02-15 21:42:46 (GMT)