summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'fix-atomic-rename-Windows-sharing-violation'Brad King2014-05-141-2/+4
|\ | | | | | | | | 24bd7ae1 cmSystemTools::RenameFile: Retry on Windows ERROR_SHARING_VIOLATION
| * cmSystemTools::RenameFile: Retry on Windows ERROR_SHARING_VIOLATIONEric Berge2014-05-131-2/+4
| | | | | | | | | | | | | | Add ERROR_SHARING_VIOLATION to the set of errors (previously including only ERROR_ACCESS_DENIED) that cause a rename (MoveFile) on Windows to retry. The condition was observed when two renames to the same target file name were happening simultaneously.
* | Merge topic 'update-kwsys'Brad King2014-05-1410-156/+185
|\ \ | | | | | | | | | | | | | | | 7fa16df4 Merge branch 'upstream-kwsys' into update-kwsys 7762c574 KWSys 2014-05-07 (6074f33f)
| * \ Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-05-1310-156/+185
| |\ \
| | * | KWSys 2014-05-07 (6074f33f)KWSys Robot2014-05-1310-156/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 6074f33f | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' f3a36760..6074f33f Ben Boeckel (22): ef3bfa01 c_str: Don't use .c_str() when streaming strings 9c165368 Glob: Use string comparisons if you have them ready 53ba0bc6 containers: Use .empty() instead of .size() where possible 6cbb57ac strings: Use string methods instead of size calculations e53596b7 RegularExpression: Add string overloads aec9de6a CommandLineArguments: Push the string back, not its C string 1d531416 Glob: Accept a string in Glob::AddFile 81f5e0a8 Glob: Accept a string in Glob::AddExpression d40c2706 SystemTools: Remove redundant if guards c1296f4a SystemTools: Defer computing length until after a .empty() check 7ffb7106 SystemTools: Use the iterator constructor for strings 29e3b1d8 SystemTools: Use .rfind('/') rather than .find_last_of("/") 5eb3a65c SystemTools: Don't construct a string just for its length b07b5fc1 SystemTools: Take a string in GetShortPath 153f6df7 SystemTools: Use strings in ComparePath 2c2f6604 SystemTools: Accept strings in IsSubDirectory 84db9ee5 SystemTools: Take strings in AddTranslationPath 4b409aa4 SystemTools: Take strings in SplitPath d2dbff07 SystemTools: Take strings in CollapseFullPath e9204f8f SystemTools: Take strings in AddKeepPath 3254681a SystemTools: Reserve memory in JoinPath 6074f33f SystemTools: Use static strings in SystemToolsAppendComponents Change-Id: I53c7a1005206dba43ee785bf807c478bf146ca0e
* | | | Merge topic 'WriteCompilerDetectionHeader-module'Brad King2014-05-1440-0/+682
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 62a4a67d Add the WriteCompilerDetectionHeader module.
| * | | | Add the WriteCompilerDetectionHeader module.Stephen Kelly2014-05-1440-0/+682
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Provide a function to write a portable header to detect compiler features. Generate a preprocessor #error for unknown compilers and compiler versions whose features are not yet recorded. This error condition might be relaxed in the future, but for now it is useful for verification of expectations.
* | | | | Merge branch 'release'Brad King2014-05-140-0/+0
|\ \ \ \ \
| * | | | | CMake 3.0.0-rc5v3.0.0-rc5Brad King2014-05-131-1/+1
| | |_|_|/ | |/| | |
* | | | | CMake Nightly Date StampKitware Robot2014-05-141-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'FindGTest-add_test-signature'Brad King2014-05-131-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 293bcf7a FindGTest: use new add_test() signature (#14913)
| * | | | FindGTest: use new add_test() signature (#14913)Rolf Eike Beer2014-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | This allows to use target names as executables.
* | | | | Merge branch 'release'Brad King2014-05-130-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'ninja-intel-linux' into releaseBrad King2014-05-091-2/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'backport-target-property-policy-context' into releaseBrad King2014-05-097-20/+38
| |\ \ \ \ \
* | | | | | | CMake Nightly Date StampKitware Robot2014-05-131-1/+1
| |_|_|/ / / |/| | | | |
* | | | | | Merge topic 'package-disable-registry'Brad King2014-05-1212-6/+135
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ba387cb8 Help: Add notes for topic 'package-disable-registry' be8ae960 Allow the Package Registry to be disabled (#14849) d09fda5d Tests: Improve FindPackageTest for in-source builds ac24a1c0 Tests: Improve FindPackageTest exported package version
| * | | | | | Help: Add notes for topic 'package-disable-registry'Brad King2014-05-121-0/+11
| | | | | | |
| * | | | | | Allow the Package Registry to be disabled (#14849)Daniele E. Domenichelli2014-05-1210-4/+115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a project is packaged for redistribution the local package registries should not be updated or consulted. They are for developers. Add variables to disable use of package registries globally: * CMAKE_EXPORT_NO_PACKAGE_REGISTRY that disables the export(PACKAGE) command * CMAKE_FIND_PACKAGE_NO_PACKAGE_REGISTRY that disables the User Package Registry in all the find_package calls. * CMAKE_FIND_PACKAGE_NO_SYSTEM_PACKAGE_REGISTRY that disables the System Package Registry in all the find_package calls. Update documentation and unit tests.
| * | | | | | Tests: Improve FindPackageTest for in-source buildsBrad King2014-05-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a different directory name for the Exporter build tree so that it is out-of-source even when the main test is in-source.
| * | | | | | Tests: Improve FindPackageTest exported package versionBrad King2014-05-122-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a random version component so that the test is unlikely to conflict with other tests of the same CMake version on the same machine.
* | | | | | | Merge topic 'features-gnu-oldest-supported'Brad King2014-05-121-10/+9
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | f782417b Features: Record the oldest supported compiler.
| * | | | | | Features: Record the oldest supported compiler.Stephen Kelly2014-05-081-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This may be used to ensure that features are reported correctly only if the compiler minimum version is met.
* | | | | | | Merge topic 'minor-cleanups'Brad King2014-05-127-15/+47
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bc9a8bba Makefile: Undef FEATURE_STRING iteration define after use. eb638c75 Tests: Make CompileFeatures feature list lang-specific. e2f09aff CMakeConfigurableFile: Remove excess newline. 5109b042 Features: Fix GNU 4.8.1 version test. 6a9fdbeb Test: Parameterize the language in the CompileFeature test. f5bf9d43 Tests: Make CompileFeature tests use highest standard known.
| * | | | | | | Makefile: Undef FEATURE_STRING iteration define after use.Stephen Kelly2014-05-101-0/+1
| | | | | | | |
| * | | | | | | Tests: Make CompileFeatures feature list lang-specific.Stephen Kelly2014-05-102-4/+4
| | | | | | | |
| * | | | | | | CMakeConfigurableFile: Remove excess newline.Stephen Kelly2014-05-101-1/+0
| | | | | | | |
| * | | | | | | Features: Fix GNU 4.8.1 version test.Stephen Kelly2014-05-101-1/+1
| | | | | | | |
| * | | | | | | Test: Parameterize the language in the CompileFeature test.Stephen Kelly2014-05-091-19/+23
| | | | | | | |
| * | | | | | | Tests: Make CompileFeature tests use highest standard known.Stephen Kelly2014-05-093-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the use of check_cxx_source_compiles which is now just getting in the way. Blacklist the cxx_alignof feature in the test with GNU 4.7. The test file compiles, but it is documented as available first in GNU 4.8.
* | | | | | | | Merge topic 'ninja-intel-linux'Brad King2014-05-121-2/+4
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 54535f47 Ninja: Fix deptype for Intel compiler on Linux
| * | | | | | | Ninja: Fix deptype for Intel compiler on LinuxBrad King2014-05-091-2/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~305^2 (Ninja: deptype msvc for Intel's compiler on Windows, 2013-11-25) we used "deps = msvc" for the Intel compiler. This is correct only on Windows. On Linux we still want "deps = gcc". Fix the logic to use "deps = msvc" when the compiler id or the "simulate id" is "MSVC". This will preserve the behavior on Intel for Windows and fix the behavior on Intel for Linux. In the future this should be converted to a platform information module variable.
* | | | | | | Merge topic 'target-property-policy-context'Brad King2014-05-1210-24/+64
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75c3d18d Merge branch 'backport-target-property-policy-context' into target-property-policy-context 911cc9a3 cmTarget: Evaluate CMP0026 and CMP0051 in calling context cb810abe cmTarget: Drop unused GetProperty signature 23409f50 cmTarget: Evaluate CMP0026 in calling context 2e75bf67 cmTarget: Drop unused GetProperty signature
| * \ \ \ \ \ \ Merge branch 'backport-target-property-policy-context' into ↵Brad King2014-05-090-0/+0
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | target-property-policy-context Resolve conflicts in favor of our side.
| | * | | | | | cmTarget: Evaluate CMP0026 in calling contextBrad King2014-05-097-10/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This policy should be checked at the call site that tries to access the LOCATION property, not the directory scope containing the target. Thread the caller context through cmTarget::GetProperty to use for checking the policy setting and emitting a diagnostic with proper backtrace. Extend the RunCMake.CMP0026 test with a cross-directory case.
| | * | | | | | cmTarget: Drop unused GetProperty signatureBrad King2014-05-092-11/+3
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | No callers use the second "scope" argument. Drop this signature and hard-code the default parameter value internally.
| * | | | | | cmTarget: Evaluate CMP0026 and CMP0051 in calling contextBrad King2014-05-0910-13/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These policies should be checked at the call site that tries to access the LOCATION or SOURCES property, not the directory scope containing the target. Thread the caller context through cmTarget::GetProperty to use for checking the policy setting and emitting a diagnostic with proper backtrace. Extend the RunCMake.CMP0026 and RunCMake.CMP0051 tests with cross-directory cases.
| * | | | | | cmTarget: Drop unused GetProperty signatureBrad King2014-05-092-12/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No callers use the second "scope" argument. Drop this signature and hard-code the default parameter value internally.
* | | | | | | Merge topic 'osx-package-DragNDrop'Brad King2014-05-127-19/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dc3c2102 OS X: Package with DragNDrop instead of PackageMaker
| * | | | | | | OS X: Package with DragNDrop instead of PackageMakerBrad King2014-05-087-19/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the CPack DragNDrop generator instead of the deprecated PackageMaker tool to package CMake itself. This provides an installation experience that is more consistent with other products on OS X and allows users to select the destination directory easily. It also avoids installing "/private/var/db/receipts/com.Kitware.CMake.*" receipts that must be removed by "pkgutil --forget com.Kitware.CMake" before another version of CMake can be installed. The DragNDrop installer does not support a post-flight script, so drop our configuration of it. The cmake-gui has an option for installing symbolic links to enable command-line use. In practice users may simply add "/Applications/CMake.app/Contents/bin" to their PATH instead.
* | | | | | | CMake Nightly Date StampKitware Robot2014-05-121-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-05-111-1/+1
| | | | | | |
* | | | | | | CMake Nightly Date StampKitware Robot2014-05-101-1/+1
| |_|/ / / / |/| | | | |
* | | | | | CMake Nightly Date StampKitware Robot2014-05-091-1/+1
|/ / / / /
* | | | | Merge topic 'dev/faster-evis'Brad King2014-05-08120-42/+1246
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 90f66381 Help: Add release notes for policy CMP0053 6804cd04 Help: Add documentation on escaping changes with CMP0053 411f77d1 EVIS: Add tests for syntax corner cases and CMP0053 bc385658 EVIS: Reimplement using custom parsing code 25102efc EVIS: Add policy CMP0053 e423f1c0 Windows: Avoid () in environment variable references c179b289 Help: Add more reference targets to cmake-language.7 c3d98bd2 Utilities/Release: Use ${VAR} instead of @VAR@ syntax
| * | | | Help: Add release notes for policy CMP0053Brad King2014-05-081-0/+6
| | | | |
| * | | | Help: Add documentation on escaping changes with CMP0053Ben Boeckel2014-05-081-6/+13
| | | | |
| * | | | EVIS: Add tests for syntax corner cases and CMP0053Ben Boeckel2014-05-08108-14/+692
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include tests for: - @ expansion during normal execution - various characters in variable names for comparison between the new and the old parser - corner cases in the parsers - correct messages when behavior is different
| * | | | EVIS: Reimplement using custom parsing codeBen Boeckel2014-05-082-17/+469
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new implementation of ExpandVariablesInString and select between the old and new implementations based on policy CMP0053. Instead of cmCommandArgumentParserHelper, use a custom parser with our own stack. This is much faster and works well for our simple grammar. The new behavior of CMP0053 should expand @VAR@ syntax only in certain contexts. All existing EVIS callers use "replaceAt == true" so hard-code our call to the old implementation. Update the signature to default to "replaceAt == false" and pass "replaceAt == true" explicitly in the call sites for configure_file and string(CONFIGURE). Testing the configure (no generate) step with ParaView shows ~20% performance improvement. In terms of complete configure/generate steps, further testing with ParaView shows a 20% performance improvement over 2.8.12.2 with Unix Makefiles and minimal with Ninja. Ninja is less because it generate step is the expensive part (future work will address this) by a long shot and these changes help the configure step for the most part.
| * | | | EVIS: Add policy CMP0053Ben Boeckel2014-05-085-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | This policy switches between the old EVIS parser and the new, faster parser.