summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* ctest_update: Add support for Perforce p4 clientPedro Navarro2013-10-2611-2/+969
| | | | | | | | | | | Teach the ctest_update implementation to use the p4 command-line client to perform updates and extract the list of changes. Add a CTest.UpdateP4 test like those that exist already for the other version control tools. Make the test available when p4 and the p4d server are found. During the test launch p4d in the background to serve a repository from the test directory. Then direct the client toward this server for the duration of the test.
* Merge topic 'rst-literal-blocks'Brad King2013-10-224-31/+107
|\ | | | | | | | | | | 2d0287d cmRST: Process literal blocks after paragraphs ending in '::' 7b9ae40 cmRST: Do not process inline markup in code-block literals
| * cmRST: Process literal blocks after paragraphs ending in '::'Brad King2013-10-214-0/+59
| | | | | | | | | | | | | | Teach cmRST to recognize non-markup lines ending in '::' followed by a blank line as starting a literal block. Record the whole block as if it were a literal block directive and print it just like a code block. Extend the CMakeLib.testRST test to cover such cases.
| * cmRST: Do not process inline markup in code-block literalsBrad King2013-10-214-31/+48
| | | | | | | | | | | | | | | | Move the ProcessDirectiveParsedLiteral and ProcessDirectiveCodeBlock method internals into an OutputMarkupLines helper. Pass through it a new "inlineMarkup" parameter and teach OutputLine to understand it. When false, do not process inline markup. Extend the CMakeLib.testRST test to cover the two cases.
* | Merge topic 'genex-conversion-warnings'Brad King2013-10-224-10/+10
|\ \ | | | | | | | | | | | | a80fe4b use size_t for GeneratorExpressionContent::ContentLength to fix some warnings
| * | use size_t for GeneratorExpressionContent::ContentLength to fix some warningsRolf Eike Beer2013-10-214-10/+10
| |/ | | | | | | | | | | CMake/Source/cmGeneratorExpressionParser.cxx: In member function ‘void cmGeneratorExpressionParser::ParseGeneratorExpression(std::vector<cmGeneratorExpressionEvaluator*>&)’: CMake/Source/cmGeneratorExpressionParser.cxx:116:55: warning: conversion to ‘unsigned int’ from ‘long int’ may alter its value [-Wconversion] CMake/Source/cmGeneratorExpressionParser.cxx:240:39: warning: conversion to ‘int’ from ‘long int’ may alter its value [-Wconversion]
* | Merge topic 'string-CONCAT-command'Brad King2013-10-2210-0/+63
|\ \ | | | | | | | | | | | | 4e184a2 string: Add CONCAT sub-command
| * | string: Add CONCAT sub-commandBrad King2013-10-2110-0/+63
| | | | | | | | | | | | | | | | | | Add a string(CONCAT) command to simply concatenate input arguments together. This will be useful for combining strings from different quoting syntaxes. Add a RunCMake.string test covering these cases.
* | | Merge topic 'xcode-folder-types'Brad King2013-10-221-5/+16
|\ \ \ | | | | | | | | | | | | | | | | e5ec8ad Xcode: Generate 'folder' source type for directories (#14498)
| * | | Xcode: Generate 'folder' source type for directories (#14498)Michael Priestman2013-10-211-5/+16
| | |/ | |/| | | | | | | | | | | | | Teach the Xcode generator to set 'lastKnownFileType' to be 'folder' for file references that are directories. If you set 'explicitFileType' to 'sourcecode', then Xcode cannot browse the directory.
* | | Merge topic 'doc-vs-keyword-properties'Brad King2013-10-222-2/+8
|\ \ \ | | | | | | | | | | | | | | | | b9fe4b6 VS: Document VS_GLOBAL_KEYWORD and VS_KEYWORD relationship (#14493)
| * | | VS: Document VS_GLOBAL_KEYWORD and VS_KEYWORD relationship (#14493)Brad King2013-10-212-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | These two target properties serve the same purpose for different versions of Visual Studio. Document the versions covered by each property. Reported-by: mar.na@t-online.de
* | | | Merge topic 'double-colon-is-imported'Brad King2013-10-2220-11/+124
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f063c45 Consider targets with double colons to be IMPORTED or ALIAS targets.
| * | | | Consider targets with double colons to be IMPORTED or ALIAS targets.Stephen Kelly2013-10-2120-11/+124
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a policy to control the behavior. The AliasTargets unit test already tests that using a double-semicolon in the name is not an error. Change the ExportImport test to use a namespace with a double-semicolon too.
* | | | | Merge topic 'vs9-target-framework-version'Brad King2013-10-221-0/+5
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0698714 VS: Set .NET target framework version for VS 7-9 (#14499)
| * | | | | VS: Set .NET target framework version for VS 7-9 (#14499)Brad King2013-10-211-0/+5
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the VS 7-9 generators to honor the VS_DOTNET_TARGET_FRAMEWORK_VERSION target property. This was already done for VS >= 10 by commit cfe6300a (VS: Add support for .NET target framework version, 2013-06-14). Inspired-by: mar.na@t-online.de
* | | | | Merge topic 'cmake--build-pipes'Brad King2013-10-224-16/+8
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | bcd5de7 cmake: Always pass through stdout/stderr in --build mode
| * | | | | cmake: Always pass through stdout/stderr in --build modeBrad King2013-10-184-16/+8
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Enable the --use-stderr behavior by default and ignore the old option. Passing through the pipes allows color terminal output and other things to work as if one ran the native build command directly.
* | | | | Merge topic 'remove-cmake-i-wizard'Brad King2013-10-229-273/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a8226e9 cmake: Drop support for "-i" wizard mode
| * | | | | cmake: Drop support for "-i" wizard modeBrad King2013-10-189-273/+9
| |/ / / / | | | | | | | | | | | | | | | | | | | | Tell users to pass cache values with the -D option on the command line or use cmake-gui or ccmake.
* | | | | CMake Nightly Date StampKitware Robot2013-10-221-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'INTERFACE_LIBRARY-build-targets'Brad King2013-10-2111-75/+172
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | b04f3b9 Create make rules for INTERFACE_LIBRARY targets. dba4962 Makefile: Always create clean target command
| * | | | Create make rules for INTERFACE_LIBRARY targets.Stephen Kelly2013-10-2111-38/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The result is that the depends of the target are created. So, add_library(somelib foo.cpp) add_library(anotherlib EXCLUDE_FROM_ALL foo.cpp) add_library(extra EXCLUDE_FROM_ALL foo.cpp) target_link_libraries(anotherlib extra) add_library(iface INTERFACE) target_link_libraries(iface INTERFACE anotherlib) Executing 'make iface' will result in the anotherlib and extra targets being made. Adding a regular executable to the INTERFACE of an INTERFACE_LIBRARY will not result in the executable being built with 'make iface' because of the logic in cmComputeTargetDepends::AddTargetDepend. So far, this is implemented only for the Makefile generator. Other generators will follow if this feature is possible for them. Make INTERFACE_LIBRARY targets part of the all target by default. Test this by building the all target and making the expected library EXCLUDE_FROM_ALL.
| * | | | Makefile: Always create clean target commandBrad King2013-10-161-37/+37
| | | | | | | | | | | | | | | | | | | | | | | | | Borland Make complains if the phony clean target has no rule to build it. If there are no files to clean, generate and run an empty clean script.
* | | | | Merge topic 'minor-cleanups'Brad King2013-10-215-6/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 187385a cmCoreTryCompile: Fix typo in comments. af2a3ab cmTarget: Remove unused variable. 620b0e9 target_link_libraries(): Fix code snippet in documentation. 2d4ce80 cmPolicies: Fix typo d6dd264 include(): Use lower case and () to refer to the include() command.
| * | | | | cmCoreTryCompile: Fix typo in comments.Stephen Kelly2013-10-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Add 'S' to match actual variable names.
| * | | | | cmTarget: Remove unused variable.Stephen Kelly2013-10-181-1/+0
| | | | | |
| * | | | | target_link_libraries(): Fix code snippet in documentation.Stephen Kelly2013-10-181-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | The porting script seems to have made a mistake here.
| * | | | | cmPolicies: Fix typoStephen Kelly2013-10-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Use American spelling: behaviour -> behavior.
| * | | | | include(): Use lower case and () to refer to the include() command.Stephen Kelly2013-10-181-1/+1
| | |/ / / | |/| | |
* | | | | Merge topic 'remove-old-process-execution'Brad King2013-10-2115-1528/+201
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 765d783 cmSystemTools: Drop old RunCommand method 52b80b2 exec_program: Re-implement using KWSys Process c076476 cmake: Drop "cmake -E comspec" Win9x helper f551135 cmExtraEclipseCDT4Generator: Replace RunCommand with RunSingleCommand
| * | | | | cmSystemTools: Drop old RunCommand methodBrad King2013-10-1910-1510/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All calls to this method have been replaced by newer infrastructure. Remove it and the supporting cmWin32ProcessExecution class.
| * | | | | exec_program: Re-implement using KWSys ProcessBrad King2013-10-192-4/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop use of cmSystemTools::RunCommand. It used popen on UNIX (equivalent to /bin/sh -c "$command") and direct CreateProcess calls on Windows. Implement equivalent behavior using the KWSys Process library. Copy windows shortpath conversion logic from cmSystemTools::RunCommand.
| * | | | | cmake: Drop "cmake -E comspec" Win9x helperBrad King2013-10-192-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | Since we dropped Win9x support there is no need for this helper.
| * | | | | cmExtraEclipseCDT4Generator: Replace RunCommand with RunSingleCommandBrad King2013-10-181-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Avoid use of the old cmSystemTools::RunCommand by using RunSingleCommand instead.
* | | | | Merge topic 'policies-generic-docs'Brad King2013-10-211-0/+20
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6d50d01 Help: Add introduction section to cmake-policies manual
| * | | | | Help: Add introduction section to cmake-policies manualStephen Kelly2013-10-181-0/+20
| |/ / / / | | | | | | | | | | | | | | | Explain the concept behind policies.
* | | | | Merge topic 'vs12-parallel-cl-FS'Brad King2013-10-213-1/+7
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | 216afc8 MSVC: Add /FS flag for cl >= 18 to allow parallel compilation (#14492)
| * | | | MSVC: Add /FS flag for cl >= 18 to allow parallel compilation (#14492)Brad King2013-10-183-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In generators such as Ninja that can run multiple "cl" processes that refer to the same compiler .pdb file (/Fd) at the same time, MSVC from Visual Studio 2013 complains: fatal error C1041: cannot open program database '.../vc120.pdb'; if multiple CL.EXE write to the same .PDB file, please use /FS According to "cl /?": /FS force to use MSPDBSRV.EXE Add the flag to compilation lines for this compiler version just after the /Fd option.
* | | | | Merge topic 'cmake-syntax-updates'Brad King2013-10-2193-200/+884
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | daa0f6f Add Lua-style long brackets and long comments to CMake language a8c6523 cmListFileLexer: Convert CRLF -> LF newlines explicitly dbd9333 cmListFileLexer: Allow a leading UTF-8 Byte-Order-Mark (#11137) 5645783 cmListFileLexer: Allow command names with one letter (#14181)
| * | | | | Add Lua-style long brackets and long comments to CMake languageBrad King2013-10-1775-185/+629
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the CMake language parser to recognize Lua-style "long bracket" arguments. These start with two '[' separated by zero or more '=' characters e.g. "[[" or "[=[" or "[==[". They end with two ']' separated by the same number of '=' as the opening bracket. There is no nesting of brackets of the same level (number of '='). No escapes, variable expansion, or other processing is performed on the content between such brackets so they always represent exactly one argument. Also teach CMake to parse and ignore "long comment" syntax. A long comment starts with "#" immediately followed by an opening long bracket. It ends at the matching close long bracket. Teach the RunCMake.Syntax test to cover long bracket and long comment cases.
| * | | | | cmListFileLexer: Convert CRLF -> LF newlines explicitlyBrad King2013-10-176-27/+100
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Read input files in binary mode instead of text mode and convert CRLF newlines to LF newlines explicitly in our own buffer. This is necessary to read CMake source files with CRLF newlines on platforms whose C runtime libraries do not transform newlines in text mode. For example, a Cygwin or Linux binary may not transform CRLF -> LF in files read from a Windows filesystem. Perform the conversion ourselves to ensure that multi-line string literals in CMake source files have LF newlines everywhere.
| * | | | | cmListFileLexer: Allow a leading UTF-8 Byte-Order-Mark (#11137)Brad King2013-10-1719-10/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the lexer to read a UTF-8, UTF-16 BE/LE, or UTF-32 BE/LE Byte-Order-Mark from the start of a file if any is present. Report an error on files using UTF-16 or UTF-32 and accept a UTF-8 or missing BOM.
| * | | | | cmListFileLexer: Allow command names with one letter (#14181)Brad King2013-10-175-2/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the lexer to treat a single letter as an identifier instead of an unquoted argument. Outside of a command invocation, the parser treats an identifier as a command name and an unquoted argument as an error. Inside of a command invocation, the parser treats an identifier as an unquoted argument. Therefore this change to the lexer will make what was previously an error case work with no other behavioral change.
* | | | | | CMake Nightly Date StampKitware Robot2013-10-211-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'target-LOCATION-policy'Brad King2013-10-201-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | abfebef Cygwin: Avoid legacy warnings in RunCMake.CMP0026 test
| * | | | | Cygwin: Avoid legacy warnings in RunCMake.CMP0026 testBrad King2013-10-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set the minimum required version of CMake high enough to avoid the warning for CMAKE_LEGACY_CYGWIN_WIN32. The warning appears on stderr and breaks the expected output matching.
* | | | | | Merge topic 'vs-intel-compiler'Brad King2013-10-201-1/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1b7117a VS 6: Do not try Intel Fortran .vfproj file with msdev
| * | | | | | VS 6: Do not try Intel Fortran .vfproj file with msdevBrad King2013-10-191-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMakeDetermineCompilerId to skip trying to build a .vfproj file for Intel Fortran under Visual Studio 6. The msdev command-line build produces a popup error dialog that hangs the configuration.
* | | | | | | CMake Nightly Date StampKitware Robot2013-10-201-1/+1
| | | | | | |