summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'update-kwsys'Brad King2015-07-100-0/+0
|\ | | | | | | | | | | f0cd7324 Merge branch 'upstream-kwsys' into update-kwsys abeee541 KWSys 2015-07-08 (d3ba91e1)
| * Merge branch 'upstream-kwsys' into update-kwsysBrad King2015-07-100-0/+0
| |\
| | * KWSys 2015-07-08 (d3ba91e1)KWSys Robot2015-07-102-681/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ d3ba91e1 | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' 8504e845..d3ba91e1 Brad King (1): d3ba91e1 System: Drop Shell_* APIs
* | | Merge topic 'autorcc-qt-5.1'Brad King2015-07-101-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 9a271e13 cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)
| * | | cmQtAutoGenerators: Fix rcc invocation for Qt 5.0 and 5.1 (#15644)Brad King2015-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.2.0-rc1~480^2 (QtAutogen: Regenerate qrc files if their input changes, 2014-09-17) we added use of the rcc "--list" option. Prior to Qt 5.2 this option was called just "-list", and the older name is still supported by the newer tools. Use the older name of the option for compatibility with Qt 5.0 and 5.1.
* | | | Merge topic 'OUTPUT_NAME-genex'Brad King2015-07-109-9/+49
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 809159c9 Add generator expression support to OUTPUT_NAME target property 9a1ef0dc Help: Improve OUTPUT_NAME documentation formatting
| * | | | Add generator expression support to OUTPUT_NAME target propertyRobert Goulet2015-07-097-6/+34
| | | | |
| * | | | Help: Improve OUTPUT_NAME documentation formattingBrad King2015-07-093-3/+15
| | | | | | | | | | | | | | | | | | | | Also link to its variants.
* | | | | Merge topic 'factor-out-common-generator'Brad King2015-07-1020-581/+646
|\ \ \ \ \ | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fed5eb5b cmNinjaTargetGenerator: Use GetDefines method eacacacd cmCommonTargetGenerator: Adopt GetDefines method 0837538e cmCommonTargetGenerator: Adopt GetFlags method f4875bbd cmNinjaTargetGenerator: Add OX X framework flags 7891f5d7 cmMakefileTargetGenerator: Fix comment typo 73bfad72 cmNinjaTargetGenerator: Factor out AddIncludeFlags helper 6a56740e cmNinjaTargetGenerator: Add Fortran flag generation 058074d4 cmCommonTargetGenerator: Adopt GetFrameworkFlags ab824018 cmCommonTargetGenerator: Adopt AppendFortranFormatFlags 0b22c0b8 cmCommonTargetGenerator: Adopt AddFortranFlags and friends b2f51aef cmCommonTargetGenerator: Adopt Convert method cdb5b657 cmCommonTargetGenerator: Adopt ModuleDefinitionFile member beee7937 cmCommonTargetGenerator: Adopt GetFeature and friends abfa5f2d cmCommonTargetGenerator: Adopt ConfigName member 9d41f6d8 cmLocalCommonGenerator: Adopt ConfigName member a4a2518d cmLocalUnixMakefileGenerator3: Provide GetConfigName() accessor ...
| * | | | cmNinjaTargetGenerator: Use GetDefines methodBrad King2015-07-091-11/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simplify the per-source ComputeDefines implementation by getting target-wide defines from GetDefines. Technically this changes behavior by no-longer de-duplicating/sorting defines from both the target and the source, but this makes it consistent with the Makefile generator. It may also later help move target-wide defines into per-target compilation rules.
| * | | | cmCommonTargetGenerator: Adopt GetDefines methodBrad King2015-07-094-29/+28
| | | | | | | | | | | | | | | | | | | | | | | | | Move the member up from cmMakefileTargetGenerator so it can be re-used later by cmNinjaTargetGenerator.
| * | | | cmCommonTargetGenerator: Adopt GetFlags methodBrad King2015-07-096-103/+56
| | | | | | | | | | | | | | | | | | | | | | | | | De-duplicate per-target flag computation in Makefile and Ninja target generators.
| * | | | cmNinjaTargetGenerator: Add OX X framework flagsBrad King2015-07-091-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Teach ComputeFlagsForObject to add -F flags just like the Makefile generator does.
| * | | | cmMakefileTargetGenerator: Fix comment typoBrad King2015-07-091-1/+1
| | | | |
| * | | | cmNinjaTargetGenerator: Factor out AddIncludeFlags helperBrad King2015-07-092-16/+25
| | | | | | | | | | | | | | | | | | | | | | | | | Factor an AddIncludeFlags method out of ComputeFlagsForObject just like cmMakefileTargetGenerator has already.
| * | | | cmNinjaTargetGenerator: Add Fortran flag generationBrad King2015-07-091-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | Make ComputeFlagsForObject consistent with the Makefile generator in regard to Fortran flags.
| * | | | cmCommonTargetGenerator: Adopt GetFrameworkFlagsBrad King2015-07-094-64/+65
| | | | | | | | | | | | | | | | | | | | Move the member up from cmMakefileTargetGenerator.
| * | | | cmCommonTargetGenerator: Adopt AppendFortranFormatFlagsBrad King2015-07-094-32/+34
| | | | | | | | | | | | | | | | | | | | Move up from cmMakefileTargetGenerator.
| * | | | cmCommonTargetGenerator: Adopt AddFortranFlags and friendsBrad King2015-07-094-104/+105
| | | | | | | | | | | | | | | | | | | | | | | | | Move AddFortranFlags, GetFortranModuleDirectory, and supporting members up from cmMakefileTargetGenerator.
| * | | | cmCommonTargetGenerator: Adopt Convert methodBrad King2015-07-093-12/+15
| | | | | | | | | | | | | | | | | | | | Move it up from cmMakefileTargetGenerator.
| * | | | cmCommonTargetGenerator: Adopt ModuleDefinitionFile memberBrad King2015-07-097-70/+39
| | | | | | | | | | | | | | | | | | | | | | | | | De-duplicate the ModuleDefinitionFile and AddModuleDefinitionFlag members from the Makefile and Ninja target generators.
| * | | | cmCommonTargetGenerator: Adopt GetFeature and friendsBrad King2015-07-096-63/+34
| | | | | | | | | | | | | | | | | | | | | | | | | De-duplicate the GetFeature, GetFeatureAsBool, and AddFeatureFlags members from the Makefile and Ninja target generators.
| * | | | cmCommonTargetGenerator: Adopt ConfigName memberBrad King2015-07-096-9/+9
| | | | | | | | | | | | | | | | | | | | De-duplicate the member from the Makefile and Ninja target generators.
| * | | | cmLocalCommonGenerator: Adopt ConfigName memberBrad King2015-07-096-38/+24
| | | | | | | | | | | | | | | | | | | | De-duplicate the member from the local Makefile and Ninja generators.
| * | | | cmLocalUnixMakefileGenerator3: Provide GetConfigName() accessorBrad King2015-07-094-17/+18
| | | | | | | | | | | | | | | | | | | | | | | | | Rename internal member from ConfigurationName to ConfigName to match the ninja generator.
| * | | | cmCommonTargetGenerator: Adopt basic target generator membersBrad King2015-07-096-16/+28
| | | | | | | | | | | | | | | | | | | | | | | | | De-duplicate the GeneratorTarget, Target, and Makefile members from the local Makefile and Ninja generators.
| * | | | Add common base classes to Makefile and Ninja generatorsBrad King2015-07-0920-16/+177
| |/ / / | | | | | | | | | | | | Provide a place to move functionality common to both.
* | | | Merge topic 'move-command-line-escape-code'Brad King2015-07-109-727/+698
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | df97bea2 cmOutputConverter: Adopt command line escaping code bb7eefe4 cmOutputConverter: Adopt EscapeWindowsShellArgument method cedd6e65 cmLocalVisualStudio7Generator: Remove unused include 30faf20c cmLocalGenerator: Remove unused include
| * | | | cmOutputConverter: Adopt command line escaping codeBrad King2015-07-085-700/+673
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port code from the KWSys System_Shell APIs into cmOutputConverter. Drop it from our copy of KWSys because upstream will drop it too, and by doing it in this commit 'git blame' may have an easier time connecting the history of the content.
| * | | | cmOutputConverter: Adopt EscapeWindowsShellArgument methodBrad King2015-07-085-25/+27
| | | | | | | | | | | | | | | | | | | | Move it out of cmSystemTools and into cmOutputConverter.
| * | | | cmLocalVisualStudio7Generator: Remove unused includeBrad King2015-07-081-2/+0
| | | | |
| * | | | cmLocalGenerator: Remove unused includeBrad King2015-07-081-2/+0
| | | | |
* | | | | Merge topic 'FindIce-imported-targets'Brad King2015-07-102-0/+19
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 889b22e2 Help: Add notes for topic 'FindIce-imported-targets' cd4d2e9c FindIce: document imported targets 748f1eae FindIce: create imported targets for components
| * | | | | Help: Add notes for topic 'FindIce-imported-targets'Brad King2015-07-091-0/+4
| | | | | |
| * | | | | FindIce: document imported targetsRoger Leigh2015-07-091-0/+7
| | | | | |
| * | | | | FindIce: create imported targets for componentsDaniel Pfeifer2015-07-091-0/+8
| | | | | |
* | | | | | Merge topic 'compiler-feature-AppleClang-std-flags'Brad King2015-07-101-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 228643af AppleClang: Use modern C++14 standard flags for Apple Clang 6.1
| * | | | | | AppleClang: Use modern C++14 standard flags for Apple Clang 6.1Brad King2015-07-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The Apple Clang 6.1 compiler that comes with Xcode 6.3 is aware of the modern -std=c++14 and -std=gnu++14 flags, so use them instead of the "1y" flags. Suggested-by: darkapostle@rule506.net
* | | | | | | CMake Nightly Date StampKitware Robot2015-07-101-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'FindXercesC-versioned-library'Brad King2015-07-091-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | d3d4d627 FindXercesC: Find versioned library on Windows
| * | | | | | FindXercesC: Find versioned library on WindowsRoger Leigh2015-07-081-1/+1
| |/ / / / /
* | | | | | Merge topic 'cpack-ifw-framework-version'Brad King2015-07-091-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | ad5c76af CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSION
| * | | | | | CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSIONKonstantin Podsvirov2015-07-081-2/+4
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This setting was added to support QtIFW 2.0 in commit v3.3.0-rc1~70^2~1 (CPackIFW: Add QtIFW 2.0 support, 2015-04-27). We need to load the CPackIFW module to initialize it if it is not set.
* | | | | | Merge topic 'eclipse-cygwin-paths'Brad King2015-07-091-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a672b16a Eclipse: Fix paths in target links on cygwin
| * | | | | | Eclipse: Fix paths in target links on cygwinMarkus Grech2015-07-081-1/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a missing GetEclipsePath call to fix generation of incorrect paths for target links in Eclipse CDT generator which caused Eclipse to be unable to open files through such links. Without this the generator would generate invalid links for source files under "[Targets]", making Eclipse unable to open them. The old links looked like "C:/cygdrive/c/...", while new links correctly are "C:/...".
* | | | | | Merge topic 'CheckCompilerFlag-do-not-use-FLAGS'Brad King2015-07-094-12/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a639689c Check*CompilerFlag: Revert to previous method used to pass flags (#15641)
| * | | | | | Check*CompilerFlag: Revert to previous method used to pass flags (#15641)Brad King2015-07-084-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~397^2 (Check*CompilerFlag: Refactor method used to pass flags, 2015-02-24) these check modules pass the flags to the compiler front-end during linking as well as during compilation. This breaks checks for flags like '-x c++' that are meant only for the compilation step. Revert the change and add a test covering a compiler-only flag.
* | | | | | | Merge topic 'empty-LINK_LIBRARIES'Brad King2015-07-095-6/+26
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7aa9e80e set_property: Fix crash when setting LINK_LIBRARIES to nothing
| * | | | | | | set_property: Fix crash when setting LINK_LIBRARIES to nothingBrad King2015-07-085-6/+26
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use a special dedicated structure to store the LINK_LIBRARIES target property. Do not try to construct a string from a NULL value. Instead leave the property structure empty when no value is given. Reported-by: Ghyslain Leclerc <ghleclerc@gmail.com>
* | | | | | | Merge topic 'update-kwsys'Brad King2015-07-091-93/+58
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | / / | | |_|_|/ / | |/| | | | | | | | | | 65de27b8 Merge branch 'upstream-kwsys' into update-kwsys 42272a82 KWSys 2015-07-07 (8504e845)
generated by cgit v0.12 at 2025-01-11 18:47:36 (GMT)