summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* cmGlobalGenerator: Take Build output argument by referenceBrad King2014-07-317-51/+26
| | | | | | No call sites pass NULL to the output argument, so take it by reference to avoid the if(output) conditions. Propagate the change through the TryCompile APIs that call it.
* Merge topic 'fix-CMP0049-extra-error'Brad King2014-07-311-5/+7
|\ | | | | | | | | b2282631 cmTarget: Do not mistake a preceding error for a CMP0049 failure
| * cmTarget: Do not mistake a preceding error for a CMP0049 failureBrad King2014-07-301-5/+7
| | | | | | | | | | | | | | | | | | After calls to ProcessSourceItemCMP0049, check for an empty return string to detect a failure instead of trusting GetErrorOccuredFlag. The latter could have been left from a preceding non-fatal error. Extend the RunCMake.Configure test to cover a case that exposed this problem.
* | Merge topic 'update_jacoco_search_paths'Brad King2014-07-311-0/+3
|\ \ | | | | | | | | | | | | 9fd04f87 CTEST: Update Jacoco Coverage search paths
| * | CTEST: Update Jacoco Coverage search pathsJoseph Snyder2014-07-301-0/+3
| |/ | | | | | | | | | | | | | | | | | | Add a new additional entry to the FilePaths array when a "package" tag has been found. This path should consist of the package information found appended to the projects source directory. This change will allow code held in a /src/main/java/* directory off of the projects source directory to be found, unlike now which assumes a subdirectory contains the code.
* | Merge topic 'cpack-ifw-generator'Brad King2014-07-311-5/+65
|\ \ | | | | | | | | | | | | | | | e7511b7f CPackIFW: Add package configuration variables b2340001 CPackIFW: Document cpack_ifw_configure_component DEPENDS option
| * | CPackIFW: Add package configuration variablesKonstantin Podsvirov2014-07-291-5/+65
| | |
* | | Merge topic 'pdb-genex'Brad King2014-07-311-34/+91
|\ \ \ | | | | | | | | | | | | | | | | | | | | 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-311-0/+45
| | | |
| * | | Genex: Simplify filesytem artifact codeNils Gladitz2014-07-291-35/+47
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-07-311-1/+1
| |_|/ |/| |
* | | Merge topic 'remove-link-remnants'Brad King2014-07-301-6/+1
|\ \ \ | | | | | | | | | | | | | | | | 250ad08a Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnants
| * | | Ninja: Remove _COMPILER_LINKER_OPTION_FLAG_ remnantsNils Gladitz2014-07-291-6/+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 '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
generated by cgit v0.12 at 2025-02-15 21:11:55 (GMT)