summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'policies'Brad King2014-01-0946-44/+405
|\ | | | | | | | | | | | | | | | | 73e9340 get_target_property: Error on non-existent target. ab9f58f FindQt4: Ensure target exists before calling get_target_property. 37ebeb9 FindQt4: Fix use of get_target_property to use actual target name. 6aabb6a Genex: Use case-sensitive comparison for COMPILER_ID. 5bb53f6 cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy.
| * get_target_property: Error on non-existent target.Stephen Kelly2014-01-0818-1/+97
| | | | | | | | Introduce policy CMP0045 to control this behavior.
| * FindQt4: Ensure target exists before calling get_target_property.Stephen Kelly2014-01-081-11/+15
| | | | | | | | | | This macro is called for all potential Qt targets, even those which were not found.
| * FindQt4: Fix use of get_target_property to use actual target name.Stephen Kelly2014-01-081-1/+1
| | | | | | | | | | This was introduced in ba48e63f (Generate config-specific interface link libraries propeties., 2013-02-09).
| * Genex: Use case-sensitive comparison for COMPILER_ID.Stephen Kelly2014-01-0813-1/+130
| |
| * cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy.Stephen Kelly2014-01-0823-31/+163
| |
* | Merge topic 'optional-install'Brad King2014-01-0920-2/+265
|\ \ | | | | | | | | | | | | be0458c InstallRules: added new variable to disable generation of install rules
| * | InstallRules: added new variable to disable generation of install rulesNils Gladitz2014-01-0820-2/+265
| | | | | | | | | | | | | | | | | | The boolean variable CMAKE_SKIP_INSTALL_RULES allows disabling generation of install rules for projects which don't want them.
* | | Merge topic 'vs10-include-backslashes'Brad King2014-01-091-1/+3
|\ \ \ | | | | | | | | | | | | | | | | c131107 VS: Convert include path to backslashes for VS >= 10
| * | | VS: Convert include path to backslashes for VS >= 10Brad King2014-01-081-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In VS <= 9 we already convert include paths to use backslashes but the conversion was left out of the VS >= 10 generator. Add the conversion now for consistency. VS 11 and 12 now require it because they mistakenly interpret forward-slash options that happen to occur in paths: http://connect.microsoft.com/VisualStudio/feedback/details/778367
* | | | Merge topic 'qt4-find-root'Brad King2014-01-091-2/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e8b8b37 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
| * | | | FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.Clinton Stimpson2014-01-081-2/+5
| | | | | | | | | | | | | | | | | | | | Thanks to Thomas Petazzoni for part of this fix.
* | | | | Merge topic 'multiarch-multios'Brad King2014-01-091-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f293d52 GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels
| * | | | | GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernelsDimitri John Ledkov2013-12-191-1/+1
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-01-091-1/+1
| | | | | |
* | | | | | Merge topic 'cmp0022-docs'Brad King2014-01-081-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 28ffb7e Note how to write CMP0022 compatible code with CMake 2.8.9.
| * | | | | | Note how to write CMP0022 compatible code with CMake 2.8.9.Stephen Kelly2014-01-081-0/+4
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | This has come up on the mailing list, and various other places.
* | | | | | Merge topic 'wix-cmake-package-registry'Brad King2014-01-083-1/+56
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 92c4d40 CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variable
| * | | | | | CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variableNils Gladitz2014-01-083-1/+56
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Allows automatic registration of installed packages with the cmake package registry.
* | | | | | Merge topic 'xcode-storyboard-file-type'Brad King2014-01-081-1/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e361c3c Merge branch 'xcode-storyboard-file-type-2.8.12' into xcode-storyboard-file-type 93fc5a5 Xcode: Fix storyboard view 2d23c1f Xcode: Fix storyboard view
| * \ \ \ \ \ Merge branch 'xcode-storyboard-file-type-2.8.12' into xcode-storyboard-file-typeBrad King2014-01-070-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolve conflict in Source/cmGlobalXCodeGenerator.cxx by keeping our side.
| | * | | | | | Xcode: Fix storyboard viewRuslan Baratov2014-01-071-2/+4
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 56831461 (Xcode: Use explicitFileType to mark source types, 2013-04-16) the Xcode generator prefers to use explicitFileType to tell Xcode about each source file type. This works better than lastKnownFileType for some file types, but not for "file.storyboard". If storyboard file has attribute 'explicitFileType' it is displayed incorrectly (as raw xml). Switch it back to 'lastKnownFileType'.
| * | | | | | Xcode: Fix storyboard viewRuslan Baratov2014-01-071-1/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 56831461 (Xcode: Use explicitFileType to mark source types, 2013-04-16) the Xcode generator prefers to use explicitFileType to tell Xcode about each source file type. This works better than lastKnownFileType for some file types, but not for "file.storyboard". If storyboard file has attribute 'explicitFileType' it is displayed incorrectly (as raw xml). Switch it back to 'lastKnownFileType'.
* | | | | | Merge topic 'minor-cleanups'Brad King2014-01-087-54/+24
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 884fb7f Remove obsolete workaround for old cmake versions. 5d1fc19 Help: Ensure that target-policies are added to the documentation. efc43cd Help: Fix some erroneous code block markers in Module docs.
| * | | | | | Remove obsolete workaround for old cmake versions.Stephen Kelly2014-01-071-11/+0
| | | | | | |
| * | | | | | Help: Ensure that target-policies are added to the documentation.Stephen Kelly2014-01-071-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The two most-recently-added policies were not tested for.
| * | | | | | Help: Fix some erroneous code block markers in Module docs.Stephen Kelly2014-01-075-43/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are many style errors in these files. This patch fixes only the syntactical errors. The script which ported these to rst tripped on some incorrectly formatted blocks in the original input documentation. Use a new script to find problematic code (and then fix them manually): #!/usr/bin/env python import os rootDir = '.' def checkFile(fname): f = open(fname) lines = f.readlines() started = False counter = 0 for l in lines: if "#" in l: started = True elif started: return lin = l.find("(") if lin != -1 and l.find(")", lin) == -1 and \ not "(To distribute this file outside of CMake, substitute the full" in l: for lp in lines[counter+1:]: if lp == "# ::\n": print "\n\n######### " + fname + "\n\n" print ''.join(lines[max(counter-2, 0):counter+6]) break elif lp == "#\n" : continue break counter += 1 for dirName, subdirList, fileList in os.walk(rootDir): for fname in fileList: checkFile(os.path.join(dirName, fname))
* | | | | | | CMake Nightly Date StampKitware Robot2014-01-081-1/+1
| |/ / / / / |/| | | | |
* | | | | | Merge topic 'minor-cleanups'Brad King2014-01-0720-102/+155
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3917d86 Genex: Add a nullary form for CONFIG 5169130 Help: Document the target properties exported to IMPORTED targets. ee21f1c CompatibleInterface: Test debugging of not-set property. 80e9fe9 Help: Note that language-specific 'built-ins' are set by the project command. 0b5bf8a Help: Mention CMAKE_DISABLE_FIND_PACKAGE_<PackageName> in package docs. 28c865b Tests: simplify Qt4 target usage 6cfe6b8 Help: Fix typo: 'target' -> 'target property' b7deca4 Test: Remove obsolete commented code. 9c9f69f Genex: Make EQUAL support upper case binary literals 6eb3218 Genex: Fix case of methods in the dag checker. 646c6ec Genex: Use a preprocessor loop to implement transitive DAG check. 711fb38 Genex: List transitive properties and methods as a table, not two lists. 802a28f Add cmHasLiteralSuffix API.
| * | | | | Genex: Add a nullary form for CONFIGStephen Kelly2014-01-076-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is consistent with other similar expressions such as PLATFORM_ID, and makes the CONFIGURATION expression obsolete. Fix an off-by-one error in GeneratorExpressionContent::EvaluateParameters exposed by a unit test. Remove the test for 'bad' nullary use of $<CONFIG>. Add a unit test to verify that $<CONFIG> and $<CONFIGURATION> have the same value.
| * | | | | Help: Document the target properties exported to IMPORTED targets.Stephen Kelly2014-01-072-0/+24
| | | | | |
| * | | | | CompatibleInterface: Test debugging of not-set property.Stephen Kelly2014-01-072-1/+8
| | | | | |
| * | | | | Help: Note that language-specific 'built-ins' are set by the project command.Stephen Kelly2014-01-071-1/+5
| | | | | |
| * | | | | Help: Mention CMAKE_DISABLE_FIND_PACKAGE_<PackageName> in package docs.Stephen Kelly2014-01-071-0/+4
| | | | | |
| * | | | | Tests: simplify Qt4 target usageStephen Kelly2014-01-071-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This content was copied from another test where both the Core and Gui targets are used.
| * | | | | Help: Fix typo: 'target' -> 'target property'Stephen Kelly2014-01-071-3/+3
| | | | | |
| * | | | | Test: Remove obsolete commented code.Stephen Kelly2014-01-071-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should not have survived in commit a247911a (Tests: Don't read the LOCATION property from build targets., 2013-11-18).
| * | | | | Genex: Make EQUAL support upper case binary literalsStephen Kelly2014-01-063-15/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As C++11, python, D and java do. http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2012/n3472.pdf Add test for uppercase hex literals.
| * | | | | Genex: Fix case of methods in the dag checker.Stephen Kelly2014-01-063-9/+9
| | | | | |
| * | | | | Genex: Use a preprocessor loop to implement transitive DAG check.Stephen Kelly2014-01-062-32/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The other infrastructure for transitive property handling is already using a preprocessor loop. Implement special backward-compatibility handling of COMPILE_DEFINITIONS_<CONFIG> using a template switch for the extra check.
| * | | | | Genex: List transitive properties and methods as a table, not two lists.Stephen Kelly2014-01-061-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | Introduce a new set of macros to select the column.
| * | | | | Add cmHasLiteralSuffix API.Stephen Kelly2014-01-063-12/+30
| | | | | |
* | | | | | Merge topic 'doc-cpp-allowed'Brad King2014-01-071-0/+159
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 58c174e Help: Document the C++ subset permitted for CMake code.
| * | | | | | Help: Document the C++ subset permitted for CMake code.Stephen Kelly2014-01-061-0/+159
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | This may be incomplete, but further limitations can be added when needed.
* | | | | | Merge topic 'unicode-fstream'Brad King2014-01-0775-228/+292
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5730710 Use cmsys::[io]fstream instead of cmsys_ios::[io]fstream.
| * | | | | | Use cmsys::[io]fstream instead of cmsys_ios::[io]fstream.Clinton Stimpson2014-01-0775-228/+292
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Also use SystemTools::Fopen() instead of fopen(). This is to eventually support utf-8 filenames.
* | | | | | Merge topic 'unicode-main'Brad King2014-01-075-14/+44
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1e542f Use Encoding::CommandLineArguments for main() functions.
| * | | | | | Use Encoding::CommandLineArguments for main() functions.Clinton Stimpson2014-01-045-14/+44
| |/ / / / /
* | | | | | CMake Nightly Date StampKitware Robot2014-01-071-1/+1
| |/ / / / |/| | | |
* | | | | Merge topic 'minor-cleanups'Brad King2014-01-0634-155/+581
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 84fac67 Don't allow include() of export(EXPORT) file at configure time. faedd2b cmTarget: Fix system include annotation propagation. 9eb06d0 add_library: Disallow invalid signatures for INTERFACE_LIBRARY. 10d65d5 cmTarget: Move a variable initialization closer to where it is used. 0f3e8e9 Undefine local preprocessor loop variables. 9ba47ee Genex: Reform error-checking for nullary/unary expressions. fa651c7 cmTarget: Remove some of the INTERFACE_LIBRARY whitelisted properties. 61d138a cmTarget: INTERFACE_LIBRARY is always EXCLUDE_FROM_ALL. 3429541 export: Rename some variables to reflect content type. 7461d67 cmTarget: Enable convenient include dir handling for INTERFACE_LIBRARY. 7fc6e3d cmTarget: Remove dead code. 2af966d Genex: Add EQUAL expression. 2d66380 cmTarget: Use strtol for numeric parsing.