summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Handle more than one process with sanitizer errors.Bill Hoffman2014-07-243-11/+27
| | | | | | Since the Sanitizers write out one log file per process, a single test might have more than one log file. This commit allows ctest to read all of the log files found for a particual test.
* CMake Nightly Date StampKitware Robot2014-07-241-1/+1
|
* Merge topic 'refactor-makerule-path-conversion'Brad King2014-07-2310-35/+40
|\ | | | | | | | | | | | | | | 848fab95 cmGlobalVisualStudio7Generator: Remove unused variable 85cea8a7 cmDepends: Refactor object file path conversion e7ee892b cmLocalGenerator: Fix AddBuildTargetRule object file path conversion 9f92a78b cmLocalGenerator: Rename 'MAKEFILE' to 'MAKERULE'
| * cmGlobalVisualStudio7Generator: Remove unused variableBrad King2014-07-221-1/+0
| |
| * cmDepends: Refactor object file path conversionBrad King2014-07-223-17/+23
| | | | | | | | | | | | | | | | Delay conversion of the path to object files (on the left-hand side of dependencies) until just before they are written. Also do not convert the format of paths written to the 'depend.internal' file. This is consistent with the way the right-hand side of dependencies are already handled.
| * cmLocalGenerator: Fix AddBuildTargetRule object file path conversionBrad King2014-07-221-1/+1
| | | | | | | | The object file list is constructed for a shell, not a Makefile rule.
| * cmLocalGenerator: Rename 'MAKEFILE' to 'MAKERULE'Brad King2014-07-229-18/+18
| | | | | | | | | | Rename the internal enumeration value for converting paths destined for use in Makefile rule syntax.
* | Merge topic 'refactor-generator-startup'Brad King2014-07-2310-35/+22
|\ \ | | | | | | | | | | | | f5c0efdb cmGlobalGenerator: Create a non-virtual 'DoGenerate' method
| * | cmGlobalGenerator: Create a non-virtual 'DoGenerate' methodBrad King2014-07-2210-35/+22
| | | | | | | | | | | | | | | | | | | | | Make the virtual 'Generate' method protected. Make 'DoGenerate' the main entry point to generation. This gives cmGlobalGenerator a chance to do some early operations before the individual generator-specific implementations take over.
* | | Merge topic 'fix_sanitizer_test_to_work_with_sanitizer'Brad King2014-07-233-2/+10
|\ \ \ | | | | | | | | | | | | | | | | f7d62cac Fix leak and address sanitizer tests to be able to run with real tools.
| * | | Fix leak and address sanitizer tests to be able to run with real tools.Bill Hoffman2014-07-223-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When running CMake under Leak or Address Sanitizer tools, the fake reporting would get picked up by the outer CMake and reported as leaks and address failures on the CMake dashboard. This commit makes sure the test only reports simulated errors when asked to.
* | | | Merge topic 'fix-complex-test-policies'Brad King2014-07-232-0/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | fb95f820 Tests: Set policies in 'complex' tests
| * | | | Tests: Set policies in 'complex' testsBrad King2014-07-222-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These tests cover the OLD behavior of some policies. Set them to OLD to avoid warnings in the test output. Leave a comment that explains why this is done here but not recommended in general.
* | | | | CMake Nightly Date StampKitware Robot2014-07-231-1/+1
| |_|/ / |/| | |
* | | | Merge topic 'deprecated-properties'Brad King2014-07-224-5/+35
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5bbec4e3 Help: Document deprecated properties.
| * | | | Help: Document deprecated properties.Nils Gladitz2014-07-214-5/+35
| |/ / / | | | | | | | | | | | | | | | | | | | | Document the COMPILE_DEFINITIONS_<Config> properties as deprecated. Add new sections for deprecated properties and move POST_INSTALL_SCRIPT and PRE_INSTALL_SCRIPT there as well.
* | | | Merge topic 'fix_guard_malloc_forbc'Brad King2014-07-221-1/+1
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | 80ee17d8 Tests/CTestTestMemcheck: Tolerate malloc guard in BC output
| * | | Tests/CTestTestMemcheck: Tolerate malloc guard in BC outputBill Hoffman2014-07-221-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-07-221-1/+1
| |/ / |/| |
* | | Merge topic 'backport-kwsys-qnx-fix'Brad King2014-07-210-0/+0
|\ \ \ | | | | | | | | | | | | | | | | cc3248f4 KWSys SystemInformation: No SA_RESTART on QNX
| * | | KWSys SystemInformation: No SA_RESTART on QNXBob E2014-07-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | QNX not support SA_RESTART signal: /* #define SA_RESTART 0x0040 (not supported yet) */ Use it in SystemInformation only if it is defined.
* | | | Merge topic 'fix-QCC-compile-flags'Brad King2014-07-216-27/+41
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3151024d QNX: Add missing flags for configurations and artifact creation.
| * | | | QNX: Add missing flags for configurations and artifact creation.Stephen Kelly2014-07-176-27/+41
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.0.0-rc1~111^2 (QNX: Introduce QCC compiler id for that QNX platform compiler., 2014-01-20) split handling of the QNX QCC compiler into a separate compiler-id. That refactoring results in the QCC compiler not using the CMake-compiler-id "GNU", which means that the __compiler_gnu macro is no longer executed for it. Add Compiler/QCC*.cmake modules to define and call the __compiler_qcc macro and teach it to call __compiler_gnu internally. Remove the corresponding pieces from the Platform/QNX*.cmake modules. It is also necessary to change the language conditional to dereference the lang macro parameter, which is another bug introduced by the same commit. The extra -lang-c++ flag is only necessary when the CXX compiler is specified as 'qcc' instead of 'QCC' in the toolchain file, which is why this bug was not noticed before. The flag is also necessary in that case when linking in order to find the appropriate standard libraries. The flag was not previously added when linking executables, so linking failed even with CMake 2.8.12 with the lower-case compiler-id. Co-Author: Brad King <brad.king@kitware.com>
* | | | Merge topic 'update-kwsys'Brad King2014-07-213-4/+22
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | 6f3e094e Merge branch 'upstream-kwsys' into update-kwsys d4d1b7f7 KWSys 2014-07-18 (65b36ede)
| * | | Merge branch 'upstream-kwsys' into update-kwsysBrad King2014-07-183-4/+22
| |\ \ \
| | * | | KWSys 2014-07-18 (65b36ede)KWSys Robot2014-07-183-4/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract upstream KWSys using the following shell commands. $ git archive --prefix=upstream-kwsys/ 65b36ede | tar x $ git shortlog --no-merges --abbrev=8 --format='%h %s' c2a329ce..65b36ede Bob E (1): 697b1401 SystemInformation: No SA_RESTART on QNX Clinton Stimpson (1): 65b36ede Encoding: Fix testProcess to work with unicode paths. Steve Dougherty (1): 5f28a52b Terminal: Fix spelling of 'definitely' in comments Change-Id: I224745dc0ca9603ff915b727e798ef293c462d8f
* | | | | CMake Nightly Date StampKitware Robot2014-07-211-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-07-201-1/+1
| | | | |
* | | | | CMake Nightly Date StampKitware Robot2014-07-191-1/+1
| | | | |
* | | | | Merge topic 'dev/target-fastpaths'Brad King2014-07-182-330/+344
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a9c9b66c cmTarget: use a hash_map for cmTargets typedef bcb6dbc1 cmTarget: help the optimizer a bit 679f3dee cmTarget: use hash_set for sets of strings 23d6520d cmTarget: Allow caching of empty genex expansions cd54f1db cmTarget: Only copy GenEx expansions when necessary b75fc0e1 cmTarget: Don't set properties on custom targets 66076915 cmTarget: Use static strings for special property names cebefa71 cmTarget: Sort special property checks 97ce676e cmTarget: Fast path for regular properties 4cfa918a cmTarget: Factor out common code 85242b7d cmTarget: Use else/if trees rather than an if tree
| * | | | | cmTarget: use a hash_map for cmTargets typedefBen Boeckel2014-07-171-0/+7
| | | | | |
| * | | | | cmTarget: help the optimizer a bitBen Boeckel2014-07-171-3/+3
| | | | | |
| * | | | | cmTarget: use hash_set for sets of stringsBen Boeckel2014-07-171-37/+42
| | | | | |
| * | | | | cmTarget: Allow caching of empty genex expansionsBen Boeckel2014-07-171-2/+4
| | | | | |
| * | | | | cmTarget: Only copy GenEx expansions when necessaryBen Boeckel2014-07-171-10/+13
| | | | | |
| * | | | | cmTarget: Don't set properties on custom targetsBen Boeckel2014-07-171-37/+43
| | | | | | | | | | | | | | | | | | | | | | | | Properties are not required on custom targets.
| * | | | | cmTarget: Use static strings for special property namesBen Boeckel2014-07-171-36/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function is called enough that the std::string/cstr comparisons are expensive from the strlen. Cache the strings for faster comparisons.
| * | | | | cmTarget: Sort special property checksBen Boeckel2014-07-171-27/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LINK_LIBRARIES property is by *far* the most popular. Move it to the top. TYPE is second, but with more generator expression usage, that may change in the future.
| * | | | | cmTarget: Fast path for regular propertiesBen Boeckel2014-07-171-141/+157
| | | | | |
| * | | | | cmTarget: Factor out common codeBen Boeckel2014-07-161-52/+20
| | | | | |
| * | | | | cmTarget: Use else/if trees rather than an if treeBen Boeckel2014-07-161-50/+38
| | | | | | | | | | | | | | | | | | | | | | | | Skips lots of unnecessary string comparisons.
* | | | | | Merge topic 'delay-generator-platform'Brad King2014-07-1821-118/+99
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a526c35 VS: Delay getting platform name in local generator e7fdb44b VS: Delay detection of VS 10 Express 64-bit tools 6e176e6d VS: Delay platform definitions until system name is known d3d9218a VS: Remove unused method from VS 9 generator eeb60102 VS: Refactor CMAKE_FORCE_*64 platform definitions ecb34faa Tell generators about CMAKE_SYSTEM_NAME as soon as it is known
| * | | | | | VS: Delay getting platform name in local generatorBrad King2014-07-178-17/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ask the global generator during generation instead of trying to store it up front. Later the global generator may not know the platform name when it is creating the local generator.
| * | | | | | VS: Delay detection of VS 10 Express 64-bit toolsBrad King2014-07-171-8/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wait until SetSystemName when the CMAKE_SYSTEM_NAME is known. Later the decision to use 64-bit tools may depend on it.
| * | | | | | VS: Delay platform definitions until system name is knownBrad King2014-07-176-9/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the definition of CMAKE_VS_PLATFORM_NAME and other variables that are not needed by CMakeDetermineSystem out of the AddPlatformDefinitions method and into a SetSystemName method. The latter may later use CMAKE_SYSTEM_NAME to decide what platform-specific definitions to add.
| * | | | | | VS: Remove unused method from VS 9 generatorBrad King2014-07-172-10/+0
| | | | | | |
| * | | | | | VS: Refactor CMAKE_FORCE_*64 platform definitionsBrad King2014-07-1716-74/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the general infrastructure for these additional platform definitions and hard-code the only two special cases that used it. They are only for historical reasons so no new such cases should be added.
| * | | | | | Tell generators about CMAKE_SYSTEM_NAME as soon as it is knownBrad King2014-07-172-0/+12
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a cmGlobalGenerator::SetSystemName virtual method. Call it from cmGlobalGenerator::EnableLanguage as soon as CMAKE_SYSTEM_NAME is known. This will give generators a chance to adapt themselves to the target system. Pass the cmMakefile instance to the method so that the generator can update it accordingly. Return early from EnableLanguage if SetSystemName returns false.
* | | | | | Merge topic 'vs-MSTool-condition'Brad King2014-07-182-95/+142
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7a9909db VS: Make MS-tool-specific options conditional
| * | | | | | VS: Make MS-tool-specific options conditionalBrad King2014-07-172-95/+142
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make blocks adding MS-tool-specific options conditional on a new "MSTools" boolean member of cmVisualStudio10TargetGenerator. Hard-code the member to true for now to preserve existing behavior.