summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindBoost: Make imported targets fall back to `Release`Andreas Weis2016-06-201-7/+7
| | | | | | | | FindBoost only detects Debug and Release configurations. All other configurations will fall back to the configuration listed as the first entry in `IMPORTED_CONFIGURATIONS`. Switch the order so that `Release` is listed first, as this is a better fallback than `Debug` for the `RelWithDebInfo` and `MinSizeRel` configurations. See issue #16091.
* Merge branch 'release'Brad King2016-06-200-0/+0
|\
| * Merge branch 'doc-issue-tracker-move' into releaseBrad King2016-06-171-1/+1
| |\
| * \ Merge branch 'CodeBlocks-include-order' into releaseBrad King2016-06-171-7/+11
| |\ \
| * \ \ Merge branch 'revert-vs-clang-minsize' into releaseBrad King2016-06-172-2/+1
| |\ \ \
* | \ \ \ Merge topic 'cmake-trace-source'Brad King2016-06-2010-1/+58
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | e63151ff cmake: Add an option to control what files needs to be traced
| * | | | | cmake: Add an option to control what files needs to be tracedAlex Turbov2016-06-1710-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even in relatively small projects using `--trace` (and `--trace-expand`) may produce a lot of output. When developing a custom module usually one is interested in output of only a few particular modules. Add a `--trace-source=<file>` option to enable tracing only a subset of source files. The final output would be only from requested modules, ignoring anything else not matched to given filename(s).
* | | | | | Merge topic 'FindQt4-doc-QtDeclarative-imported'Brad King2016-06-201-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5ed2881c FindQt4: Document Qt4::QtDeclarative imported target (#16157)
| * | | | | | FindQt4: Document Qt4::QtDeclarative imported target (#16157)Brad King2016-06-201-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge topic 'cpack-deb-test-fixes'Brad King2016-06-203-10/+13
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6107fab4 CPack/Deb: Fix test to actually test the preinst script 302391ba CPack/Deb: Fix tests for SELinux-enabled systems
| * | | | | | CPack/Deb: Fix test to actually test the preinst scriptDomen Vrankar2016-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The test regex variable name was invalid and did not test preinst script. Reported-by: Patrick <mail6543210@yahoo.com.tw>
| * | | | | | CPack/Deb: Fix tests for SELinux-enabled systemsDomen Vrankar2016-06-203-10/+13
| |/ / / / / | | | | | | | | | | | | | | | | | | Suggested-by: Patrick <mail6543210@yahoo.com.tw>
* | | | | | Merge topic 'pkgconfig-targets'Brad King2016-06-201-2/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8345c646 FindPkgConfig: define the imported targets also when the data comes from cache
| * | | | | | FindPkgConfig: define the imported targets also when the data comes from cacheRolf Eike Beer2016-06-191-2/+6
| |/ / / / /
* | | | | | Merge topic 'refactor-flags'Brad King2016-06-2013-160/+157
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 802b36fb cmExtraSublimeTextGenerator: Use GetTargetCompileFlags 3c488ce8 cmLocalGenerator: Adopt target compile flag generation 5467e794 cmLocalGenerator: Add method to get Fortran-specific compiler flags 49f10f0d cmGeneratorTarget: Adopt Fortran module directory generation 0392f72b Refactor Makefile/Ninja tool working directory storage
| * | | | | | cmExtraSublimeTextGenerator: Use GetTargetCompileFlagsTobias Hunger2016-06-171-24/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace some custom code with equivalent code from the framework. This also fixes some fixmes left in the custom code.
| * | | | | | cmLocalGenerator: Adopt target compile flag generationTobias Hunger2016-06-173-31/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor the flag generation out of cmCommonTargetGenerator::GetFlags into a new cmLocalGenerator::GetTargetCompileFlags method. This will allow it to be used without a target generator available.
| * | | | | | cmLocalGenerator: Add method to get Fortran-specific compiler flagsBrad King2016-06-176-49/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a cmLocalGenerator::GetTargetFortranFlags virtual method to get generator-specific generation of Fortran-specific flags. Implement it in cmLocalCommonGenerator by moving the implementation from cmCommonTargetGenerator::AddFortranFlags. This will allow it to be used without having a target generator available. Inspired-by: Tobias Hunger <tobias.hunger@qt.io>
| * | | | | | cmGeneratorTarget: Adopt Fortran module directory generationTobias Hunger2016-06-175-46/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move code to create/get the fortran module directory from the cmCommonTargetGenerator to cmGeneratorTarget. Rename the ComputeFortranModuleDirectory method to CreateFortranModuleDirectory as this method *creates* the directory if it is missing.
| * | | | | | Refactor Makefile/Ninja tool working directory storageBrad King2016-06-178-16/+23
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Move cmCommonTargetGenerator::WorkingDirectory to cmLocalCommonGenerator and add an access method.
* | | | | | Merge topic 'cmake-gui-Qt-LGPLv3'Brad King2016-06-2010-14/+190
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9ad10c8f cmake-gui: Reference LGPLv3 when redistributing Qt
| * | | | | | cmake-gui: Reference LGPLv3 when redistributing QtBrad King2016-06-1710-14/+190
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Download http://www.gnu.org/licenses/lgpl.txt and place it as Licenses/LGPLv3.txt in our source tree. When building cmake-gui, use option CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL to enable notification in the "About" dialog of how the distribution of Qt is licensed. Install the license file as ${CMAKE_ROOT}/Licenses/LGPLv3.txt so that the dialog can display a path to it.
* | | | | | Merge topic 'FindFreetype-debug-lib'Brad King2016-06-201-10/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b213a7f6 FindFreetype: Find release and debug libraries separately
| * | | | | | FindFreetype: Find release and debug libraries separatelyStuart Mentzer2016-06-171-10/+22
| |/ / / / /
* | | | | | Merge topic 'revert-vs-clang-minsize'Brad King2016-06-202-2/+1
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | | | | | | | 78249be2 VS: Fix regressed mapping for the cl `/Os` compiler flag
| * | | | | VS: Fix regressed mapping for the cl `/Os` compiler flagBrad King2016-06-172-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.6.0-rc1~279^2~10 (VS: in Clang/C2 toolset, setup correct compiler settings, 2016-02-18) a flag mapping was added for the clang `-Os` flag. However, this collides with a mapping we already had for the MSVC flag of the same name. This is a symptom of a larger problem in that the VS generators need a per-toolset flag map (issue #16153). For now, simply drop the new mapping and drop `-Os` from clang compiler flags in the MinSizeRel configuration. Reported-by: Felix Bruns <felixbruns@gmail.com>
* | | | | | CMake Nightly Date StampKitware Robot2016-06-201-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-191-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2016-06-181-1/+1
| | | | | |
* | | | | | Merge topic 'doc-issue-tracker-move'Brad King2016-06-171-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | / | | |_|_|/ | |/| | | 588166f8 README: Update Issue Tracker link to new location
| * | | | README: Update Issue Tracker link to new locationBrad King2016-06-171-1/+1
| | |/ / | |/| |
* | | | Merge topic 'xcode-mig-support'Brad King2016-06-176-22/+87
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8be00e44 Help: Add release note about XCODE_FILE_ATTRIBUTES source file property 27eb657d Xcode: Add support for mig files 811f6c82 Xcode: Add XCODE_FILE_ATTRIBUTES source file property ef494edf Xcode: Don't emit empty settings blocks. 82ebbf68 Xcode: Add function to conditionally add Xcode Attributes 025edea0 Xcode: Add const qualifiers
| * | | | Help: Add release note about XCODE_FILE_ATTRIBUTES source file propertyBrad King2016-06-171-0/+6
| | | | |
| * | | | Xcode: Add support for mig filesJames Touton2016-06-171-0/+2
| | | | |
| * | | | Xcode: Add XCODE_FILE_ATTRIBUTES source file propertyJames Touton2016-06-173-0/+26
| | | | | | | | | | | | | | | | | | | | This adds values to the ATTRIBUTES list in PBXBuildFile settings.
| * | | | Xcode: Don't emit empty settings blocks.James Touton2016-06-171-6/+7
| | | | |
| * | | | Xcode: Add function to conditionally add Xcode AttributesGregor Jasny2016-06-172-0/+25
| | | | |
| * | | | Xcode: Add const qualifiersJames Touton2016-06-171-16/+21
| | | | |
* | | | | Merge topic 'link_what_you_use'Brad King2016-06-1723-6/+171
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a0902efa Help: Add notes for topic 'link_what_you_use' 96242f80 Add options to run `ldd -u -r` as a "link-what-you-use" tool
| * | | | | Help: Add notes for topic 'link_what_you_use'Brad King2016-06-171-0/+7
| | | | | |
| * | | | | Add options to run `ldd -u -r` as a "link-what-you-use" toolBill Hoffman2016-06-1722-6/+164
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create a LINK_WHAT_YOU_USE target property and corresponding CMAKE_LINK_WHAT_YOU_USE variable to enable this behavior. Extend link commands by running `ldd -u -r` to detect shared libraries that are linked but not needed.
* | | | | | Merge topic 'ice-debug'Brad King2016-06-171-6/+36
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 86bcdbcd FindIce: Support finding both release and debug libraries
| * | | | | | FindIce: Support finding both release and debug librariesRoger Leigh2016-06-161-6/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Search for both release and debug library variants, and use SelectLibraryConfigurations to choose the appropriate library. Also add both release and debug libraries to the imported targets.
* | | | | | | Merge topic 'CodeBlocks-generated-sources'Brad King2016-06-171-2/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | afd6cc6b CodeBlocks: Show generated files in non-utility targets
| * | | | | | | CodeBlocks: Show generated files in non-utility targetsEnrico Bedau2016-06-161-2/+4
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since 2.6.3 the UTILITY target may have source files. A defect was filed that these files are now visible in the source tree. A fix later removed all generated files from the source tree, regardless of the target type. You can't even include them by using the SOURCES option. This fix adds generated files again, except for the UTILITY target which cluttered the source tree. Fixes #14272.
* | | | | | | Merge topic 'CodeBlocks-include-order'Brad King2016-06-171-7/+11
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | 76b462ea cmExtraCodeBlocksGenerator: Do not shuffle include directories
| * | | | | | cmExtraCodeBlocksGenerator: Do not shuffle include directoriesTobias Hunger2016-06-171-7/+11
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Report include directories in a sensible order. Do not shuffle them when trying to make them unique.
* | | | | | CMake Nightly Date StampKitware Robot2016-06-171-1/+1
| | | | | |
* | | | | | Merge topic 'ice-3.6.2'Brad King2016-06-161-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 82ecc2a3 FindIce: Add versions 3.6.1 and 3.6.2
| * | | | | | FindIce: Add versions 3.6.1 and 3.6.2Roger Leigh2016-06-151-0/+2
| | | | | | |
generated by cgit v0.12 at 2024-12-28 00:43:14 (GMT)