summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)Joe Abbey2014-01-091-0/+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.
| * | | Don't allow include() of export(EXPORT) file at configure time.Stephen Kelly2014-01-067-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a new feature it does not need to participate in CMP0024. Store cmExportBuildFileGenerator instances which correspond to the export(EXPORT) signature in a second map which does not own the pointers. This avoids the need to add cmExportBuildFileGenerator and dependencies to the bootstrap system.
| * | | cmTarget: Fix system include annotation propagation.Stephen Kelly2014-01-066-84/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Direct users of IMPORTED targets treat INTERFACE_INCLUDE_DIRECTORIES as SYSTEM, after commit a63fcbcb (Always consider includes from IMPORTED targets to be SYSTEM., 2013-08-29). It was intended that transitive use of an IMPORTED target would have the same behavior, but that did not work. The implementation processed only direct dependencies in cmTarget::FinalizeSystemIncludeDirectories. Implement transitive evaluation of dependencies by traversing the link interface of each target in the link implementation.
| * | | add_library: Disallow invalid signatures for INTERFACE_LIBRARY.Stephen Kelly2014-01-068-5/+215
| | | | | | | | | | | | | | | | | | | | Document the valid signatures. Add a test for the IMPORTED GLOBAL signature.
| * | | cmTarget: Move a variable initialization closer to where it is used.Stephen Kelly2014-01-061-3/+1
| | | | | | | | | | | | | | | | This is more readable and easier to reason about.
| * | | Undefine local preprocessor loop variables.Stephen Kelly2014-01-064-1/+9
| | | | | | | | | | | | | | | | | | | | Most occurances of this pattern already contain the undef, so add it to the rest too.
| * | | Genex: Reform error-checking for nullary/unary expressions.Stephen Kelly2014-01-061-29/+10
| | | | | | | | | | | | | | | | | | | | | | | | The error messages were incorrect (reporting that the expression requires one or two parameters), and repeated. Remove the now-unused ZeroOrMoreParameters enum value.
| * | | cmTarget: Remove some of the INTERFACE_LIBRARY whitelisted properties.Stephen Kelly2014-01-062-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to allow EXCLUDE_* properties, because an INTERFACE_LIBRARY has no direct build output. IMPORTED_LINK_INTERFACE_LANGUAGES are relevant only to static libraries. VERSION is relevant only to the filename of direct build outputs, which INTERFACE_LIBRARY does not have.
| * | | cmTarget: INTERFACE_LIBRARY is always EXCLUDE_FROM_ALL.Stephen Kelly2014-01-061-1/+2
| | | |
| * | | export: Rename some variables to reflect content type.Stephen Kelly2014-01-062-10/+10
| | | | | | | | | | | | | | | | This method is used with a list of languages.
| * | | cmTarget: Enable convenient include dir handling for INTERFACE_LIBRARY.Stephen Kelly2014-01-066-3/+27
| | | | | | | | | | | | | | | | | | | | Make the CMAKE_INCLUDE_CURRENT_DIR_IN_INTERFACE variable affect INTERFACE_LIBRARY targets.
| * | | cmTarget: Remove dead code.Stephen Kelly2014-01-061-1/+0
| | | | | | | | | | | | | | | | | | | | Whitelisting of properties already ensures that the LOCATION property will not be read from an INTERFACE_LIBRARY.
| * | | Genex: Add EQUAL expression.Stephen Kelly2014-01-065-2/+135
| | | | | | | | | | | | | | | | Support decimal, hex, octal and binary literals.
| * | | cmTarget: Use strtol for numeric parsing.Stephen Kelly2014-01-063-6/+22
|/ / / | | | | | | | | | | | | | | | On Windows apparently sscanf can not handle hex numbers. Test that numeric comparison works with hex numbers.
* | | Merge topic 'minor-cleanups'Brad King2014-01-0652-268/+433
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a55c70d cmTarget: Remove support for <CONFIG>_LOCATION property. c9f9b3c cmTarget: Test impliedByUse number-compatible properties. fbe1fa7 cmTarget: Don't repeat property origin debug information. 01c545c cmTarget: Fix debug report for interface-set compatibility types. c67e1a6 cmTarget: Fix reporting interface-set properties which are FALSE. 07b0f54 Qt Tests: Remove commented and unneeded line. 79db8ef cmTarget: Fix the property compatibility error message 43340a9 Help: Reformat Qt autogenerator documentation. d98ea6c Help: Mark some code blocks as containing cmake code. ea78935 GenerateExportHeader: Reformat docs. 272a20f cmTarget: Don't update IMPORTED target compilation properties 03d842a Run the add_compile_options command unit test. cd3d0b6 get_property: Fix testing ALIASED_TARGET target property (#14670) 6a62228 install: Ensure that install(TARGETS) works with no DESTINATION af3d3b8 export: Only generate and install configuration files if needed. 0de81bb Help: Workaround pygments reporting an error for genexes. ...
View Lorry Controller Status