summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-PDB_NAME-fallback'Brad King2015-04-201-1/+2
|\ | | | | | | | | 164f1df2 Help: Clarify PDB_NAME fallback behavior (#15518)
| * Help: Clarify PDB_NAME fallback behavior (#15518)Brad King2015-04-171-1/+2
| | | | | | | | It uses the OUTPUT_NAME if set, not always the target name.
* | Merge topic 'stable-xcode-projects'Brad King2015-04-205-16/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6693590f Xcode: Refine quoting rules for Strings a6331eb8 Xcode: Let PrintComment decide if the comment is non-empty 6e8952c1 Xcode: PrintComment will prepend a whitespace itself before the comment 4bd2544b Xcode: Do not add whitespace after attribute group opening brace 5cb4c838 Xcode: Properly indent PBXFileReference and PBXBuildFile a723427b Xcode: Remove extra space in PBXProject comment 2fe8bca5 Xcode: Add comment after root object 2e0e205e Xcode: Indent using tabs 7b68c8df Xcode: Sort Xcode objects by Id
| * | Xcode: Refine quoting rules for StringsGregor Jasny2015-04-172-3/+3
| | | | | | | | | | | | | | | $ and . do not need to be quoted, but brackets and * must be to not confuse the Xcode parser.
| * | Xcode: Let PrintComment decide if the comment is non-emptyGregor Jasny2015-04-172-4/+5
| | |
| * | Xcode: PrintComment will prepend a whitespace itself before the commentGregor Jasny2015-04-172-4/+3
| | |
| * | Xcode: Do not add whitespace after attribute group opening braceGregor Jasny2015-04-171-1/+5
| | | | | | | | | | | | | | | | | | This suppresses the extra space that would be generated if the separator is a space. The conditional block is also used in this form elsewhere.
| * | Xcode: Properly indent PBXFileReference and PBXBuildFileGregor Jasny2015-04-171-1/+1
| | | | | | | | | | | | Move indent factor change behind indention of start-of-line.
| * | Xcode: Remove extra space in PBXProject commentGregor Jasny2015-04-171-1/+1
| | |
| * | Xcode: Add comment after root objectGregor Jasny2015-04-171-1/+2
| | |
| * | Xcode: Indent using tabsGregor Jasny2015-04-171-1/+1
| | |
| * | Xcode: Sort Xcode objects by IdGregor Jasny2015-04-172-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this patch series aims to minimize deltas between the CMake Xcode generator and Xcode itself. It was started by the observation that if one makes any change to the project within Xcode (e.g. to see how a variable is called internally) the user cannot diff the CMake project and the one stored by Xcode afterwards. Xcode keeps the objects ordered by the object id. Because cmake stores them into an unordered container at creation time they must be sorted before writing the pbxproj file. I tested this series with Xcode 6.3 and Xcode 3.2. Both show a reduced diff after this series was applied.
* | | CMake Nightly Date StampKitware Robot2015-04-201-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2015-04-191-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2015-04-181-1/+1
| |/ |/|
* | Merge topic 'cpack-one-component-only'Brad King2015-04-171-2/+2
|\ \ | | | | | | | | | | | | ed0b0630 CPack: Fix single component packaging
| * | CPack: Fix single component packagingRaffi Enficiaud2015-04-161-2/+2
| | | | | | | | | | | | | | | | | | Refine logic added in commit 0ffd3534 (CPack single component packaging, 2015-04-02). Component packaging should be enabled if either at least one component or one group is set and should not require both.
* | | Merge topic 'ninja-autogen'Brad King2015-04-176-10/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e8fdd5f1 QtAutogen: Workaround rcc CRCRLF newlines on Windows (#15459) 15f1a6b4 Tests/QtAutogen: Avoid touching files in the source tree 3f7c7c65 Tests/QtAutogen: Help Qt5Autogen test find Qt5 on Windows 26b5cc5e Tests/QtAutogen: Enable per-config source tests when possible 45566408 Tests/QtAutogen: Require CMake 3.1 to set policies everywhere
| * | | QtAutogen: Workaround rcc CRCRLF newlines on Windows (#15459)Brad King2015-04-165-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'rcc --list' operation may print newlines of the form CRCRLF, so strip any trailing CR characters found on each line. Update the Tests/QtAutogen test to use a resource named in a subdirectory. This causes 'rcc --list' to display a blank line and tests that it is correctly filtered out.
| * | | Tests/QtAutogen: Avoid touching files in the source treeBrad King2015-04-164-2/+5
| | | |
| * | | Tests/QtAutogen: Help Qt5Autogen test find Qt5 on WindowsBrad King2015-04-161-0/+8
| | | | | | | | | | | | | | | | Set CMAKE_PREFIX_PATH to tell find_package(Qt5) where to look.
| * | | Tests/QtAutogen: Enable per-config source tests when possibleBrad King2015-04-162-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pass CMAKE_BUILD_TYPE into the test on generators that use it so that the per-config part of the test can activate as needed. Do not make the per-config part conditional on the Debug configuration because the generator expressions evaluate to empty in other configurations. Skip the per-config source case with the Ninja generator because it does not currently work. cmQtAutoGenerators::InitializeAutogenTarget needs to know the list of source files on a target, but generator expressions in the list cannot be evaluated until after CreateGeneratorTargets has been called. That cannot happen until after Autogen targets have been generated. It is a chicken-and-egg problem.
| * | | Tests/QtAutogen: Require CMake 3.1 to set policies everywhereBrad King2015-04-162-2/+2
| | | | | | | | | | | | | | | | | | | | We want CMP0020 set in the autorcc_depends test. Also the test should now only run when we can support per-config source files.
* | | | Merge topic 'FPHSA-updates'Brad King2015-04-175-132/+160
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84f06d0c FPHSA: Document REQUIRED_VARS recommendation (#15352) a3ad275c FPHSA: Revise and format documentation d1a6d15b FPHSA: Always populate the ExactCase_FOUND variable (#15412).
| * | | | FPHSA: Document REQUIRED_VARS recommendation (#15352)Brad King2015-04-171-0/+4
| | | | | | | | | | | | | | | | | | | | State explicitly that the variables specified are user-facing.
| * | | | FPHSA: Revise and format documentationBrad King2015-04-171-110/+123
| | | | | | | | | | | | | | | | | | | | Use better reStructuredText markup and add cross-references.
| * | | | FPHSA: Always populate the ExactCase_FOUND variable (#15412).Stephen Kelly2015-04-175-37/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The UPPERCASE name was inconsistent with config-packages, the find_dependency macro, and even FPHSA itself, which expects components to be specified with names matching ExactCase. The FOUND_VAR was only permitted to have two possible values, and now both are set for compatibility. Document it as obsolete, and adjust the code for the same. Users of the variable should just remove it.
* | | | | CMake Nightly Date StampKitware Robot2015-04-171-1/+1
| | | | |
* | | | | Merge topic 'UseSWIG-use-absolute-path'Brad King2015-04-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dd7e31bc UseSWIG: Fix module name detection with relative source file (#15508)
| * | | | | UseSWIG: Fix module name detection with relative source file (#15508)Tuukka Pasanen2015-04-151-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When SWIG_GET_EXTRA_OUTPUT_FILES checks to see if a source file exists for use in reading the module name, it must pass an absolute path to the if(EXISTS) command. Teach SWIG_ADD_SOURCE_TO_MODULE to give it the absolute path it already knows.
* | | | | Merge topic 'vs10-no-macros'Brad King2015-04-167-55/+14
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 885ab9ab VS: Drop reload macros for VS >= 10 (#11258,#14680)
| * | | | | VS: Drop reload macros for VS >= 10 (#11258,#14680)Brad King2015-04-157-55/+14
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We never implemented them for VS 11 (2012), 12 (2013), or 14 (2015). For VS 10 (2010) the reload macro does not work correctly when run from inside a build launched through the IDE because stopping the build kills the CMake that is driving the reload. Fortunately VS >= 10 know how to reload the whole solution anyway.
* | | | | Merge topic 'vs70-deprecate'Brad King2015-04-168-2/+43
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7b8e7c4a Deprecate Visual Studio 7 generator (.NET 2002)
| * | | | | Deprecate Visual Studio 7 generator (.NET 2002)Brad King2015-04-158-2/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update documentation to mark the generator deprecated. Add a warning at the end of generation plus an option to turn off the warning.
* | | | | | Merge topic 'vs6-deprecate'Brad King2015-04-168-2/+44
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | 85c2626b Deprecate Visual Studio 6 generator
| * | | | | Deprecate Visual Studio 6 generatorBrad King2015-04-158-2/+44
| |/ / / / | | | | | | | | | | | | | | | | | | | | Update documentation to mark the generator deprecated. Add a warning at the end of generation plus an option to turn off the warning.
* | | | | CMake Nightly Date StampKitware Robot2015-04-161-1/+1
| | | | |
* | | | | Merge topic 'port-global-properties-to-cmState'Brad King2015-04-1532-415/+439
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5d056c0d Port Global property interaction to cmState. de722d7d Move property initialization to cmState. 9b5f80a8 Move global properties to cmState. 0076b5d8 cmake: Remove the happy global property scope pattern. 24b7f31d cmake: Remove unused cmCommand methods. 0aec4913 Port cmCommand consumers to cmState. 96f8c5f9 cmState: Move cmCommand-related methods from cmake class. 97e53ebb cmake: Simplify command clean up loop. 1e738bcf cmake: Simplify RemoveUnscriptableCommands algorithm. 62854e99 cmState: Move try_compile state from cmake class. db8425be cmake: Get enabled languages from cmState. 74de9a73 cmGlobalGenerator: Delegate storage of enabled languages to cmState. b159bff7 Move property definition to cmState.
| * | | | | Port Global property interaction to cmState.Stephen Kelly2015-04-1516-62/+86
| | | | | |
| * | | | | Move property initialization to cmState.Stephen Kelly2015-04-152-8/+2
| | | | | |
| * | | | | Move global properties to cmState.Stephen Kelly2015-04-154-41/+70
| | | | | |
| * | | | | cmake: Remove the happy global property scope pattern.Stephen Kelly2015-04-157-18/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Global properties are already global in scope, so remove the overload for specifying it and port users of the API. The call from cmMakefile::GetProperty can be simplified because the scope is only used during chaining, and there is no further chaining after processing global properties.
| * | | | | cmake: Remove unused cmCommand methods.Stephen Kelly2015-04-152-42/+0
| | | | | |
| * | | | | Port cmCommand consumers to cmState.Stephen Kelly2015-04-1511-37/+18
| | | | | |
| * | | | | cmState: Move cmCommand-related methods from cmake class.Stephen Kelly2015-04-134-82/+128
| | | | | |
| * | | | | cmake: Simplify command clean up loop.Stephen Kelly2015-04-131-13/+6
| | | | | |
| * | | | | cmake: Simplify RemoveUnscriptableCommands algorithm.Stephen Kelly2015-04-132-23/+8
| | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete RemoveCommand method.
| * | | | | cmState: Move try_compile state from cmake class.Stephen Kelly2015-04-133-8/+22
| | | | | |
| * | | | | cmake: Get enabled languages from cmState.Stephen Kelly2015-04-131-8/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The check for a global generator is redundant - the enabled languages are only populated by the global generator.
| * | | | | cmGlobalGenerator: Delegate storage of enabled languages to cmState.Stephen Kelly2015-04-133-12/+36
| | | | | |