summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'features-cleanups'Brad King2014-06-164-20/+23
|\ | | | | | | | | | | | | | | f0a0f3dc WCDH: Fix compiler id test for compatibility macros. 627ad96b Project: Detect other compilers before detecting Clang. bc950169 WCDH: Remove noise from generated defines. eecd93fc Features: Escape the COMPILE_OPTIONS for dialects.
| * WCDH: Fix compiler id test for compatibility macros.Stephen Kelly2014-06-131-4/+4
| | | | | | | | Enable the alignment features for Clang.
| * Project: Detect other compilers before detecting Clang.Stephen Kelly2014-06-131-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Commit v2.8.10.1~5^2 (Fix PathScale compiler id for Clang-based upstream, 2012-11-05) re-ordered the detection logic for PathScale. Other compiler vendors are also producing Clang-based frontends, so detect "actual" Clang as one of the last compilers to allow for others doing the same. http://llvm.org/devmtg/2014-04/PDFs/Posters/ClangIntel.pdf http://docwiki.embarcadero.com/RADStudio/XE5/en/Clang-based_C%2B%2B_Compilers
| * WCDH: Remove noise from generated defines.Stephen Kelly2014-06-132-12/+12
| | | | | | | | | | | | The DECL part is redundant, and the language part is not needed. The source language and context already determines the language, so there is no need to repeat it in the define name.
| * Features: Escape the COMPILE_OPTIONS for dialects.Stephen Kelly2014-06-131-2/+5
| | | | | | | | | | Allow for future handling as a list, not a string which may contain whitespace.
* | Merge topic 'ninja-avoid-double-phony'Brad King2014-06-161-0/+9
|\ \ | | | | | | | | | | | | 04377f1b Ninja: Remove CMake includes from explicit depends (#14972)
| * | Ninja: Remove CMake includes from explicit depends (#14972)Adam Strzelecki2014-06-161-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It may happen that CMake include is an explicit dependency for some command, while all CMake includes are set phony in WriteTargetRebuildManifest, this may lead to duplicate phony generate rules which causes ninja warnings. We need to remove implicit CMake includes in WriteUnknownExplicitDependencies. This fixes FindCUDA ninja warnings.
* | | Merge topic 'vs-subdir-sln-depends'Brad King2014-06-168-49/+43
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | cb67509b VS: Remove unused parameter of WriteTargetConfigurations 790e1677 VS: Fix subproject .sln dependencies on custom targets 5fba44cf VS: Move VS-only API out of cmGlobalGenerator
| * | | VS: Remove unused parameter of WriteTargetConfigurationsBrad King2014-06-133-4/+2
| | | | | | | | | | | | | | | | | | | | The cmGlobalVisualStudio7Generator::WriteTargetConfigurations 'root' parameter is no longer used, so remove it.
| * | | VS: Fix subproject .sln dependencies on custom targetsBrad King2014-06-125-35/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Each project listed in a .sln must be marked (or not) as part of the "default build" for each configuration. For targets created by the add_custom_target() command we add them to the default build if they are not excluded in some way or if another target depends on them. In the top-level .sln, a custom target is excluded if it is not created with the ALL option to add_custom_target. In subdirectory .sln files, a target may also be excluded if it is not within the directory and is brought into the solution only due to a dependency from another target in the solution. Fix the "IsPartOfDefaultBuild" and "IsDependedOn" methods to check every target to be included in the .sln for a dependency on the custom target. Otherwise transitive dependencies through targets not in the current subdirectory will not be considered. Extend the SubProject test with a custom target to cover this case. Reported-by: William Deurwaarder <William.Deurwaarder@tomtom.com> Reported-by: Dirk Steenpass <dirk.steenpass@gmail.com>
| * | | VS: Move VS-only API out of cmGlobalGeneratorBrad King2014-06-124-33/+32
| | | | | | | | | | | | | | | | | | | | Move the IsDependedOn method to cmGlobalVisualStudio7Generator since that is the only caller.
* | | | Merge topic 'cmake-no-args-output'Brad King2014-06-165-5/+52
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | de7c2882 cmake,ccmake: Produce shorter output on no arguments (#14973)
| * | | | cmake,ccmake: Produce shorter output on no arguments (#14973)Adam Strzelecki2014-06-135-5/+52
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead printing complete help cmake/ccmake now prints only Usage section and extra information how to get more help or start your build. Implementation Details: Usage help type was renamed to Help, and new Usage was introduces that prints only command line usage information without any extra details. Commands add some extra information when no arguments are passed.
* | | | CMake Nightly Date StampKitware Robot2014-06-161-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-06-151-1/+1
| | | |
* | | | CMake Nightly Date StampKitware Robot2014-06-141-1/+1
| | | |
* | | | Merge topic 'fix-read-after-free'Brad King2014-06-131-5/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5b2c2d2f Merge branch 'backport-fix-read-after-free' into fix-read-after-free 23ffb72a cmake: Fix read-after-free while checking command-line arguments fe44f057 cmake: Fix read-after-free while checking command-line arguments
| * \ \ \ Merge branch 'backport-fix-read-after-free' into fix-read-after-freeBrad King2014-06-120-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Resolve conflicts in Source/cmake.cxx in our favor.
| | * | | | cmake: Fix read-after-free while checking command-line argumentsBrad King2014-06-121-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.12~300^2~1 (CLI: Suppress the unused warning if the key value pair is cached, 2013-05-16), cmake::SetCacheArgs saves a cachedValue pointer and may cause the memory to be freed (by setting the cache entry) before reading it again. Fix this by saving the old value in a separate string.
| * | | | | cmake: Fix read-after-free while checking command-line argumentsBrad King2014-06-121-5/+13
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.12~300^2~1 (CLI: Suppress the unused warning if the key value pair is cached, 2013-05-16), cmake::SetCacheArgs saves a cachedValue pointer and may cause the memory to be freed (by setting the cache entry) before reading it again. Fix this by saving the old value in a separate string.
* | | | | Merge topic 'buildsystem-doc-updates'Brad King2014-06-133-20/+53
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20f54602 Help: Link to Object Library docs from add_library a8153181 Help: Organize add_library command documentation d8319f0f Help: Update style guide to use section headers for command signatures 50dca471 Help: Organize Binary Targets section of cmake-buildsystem.7 4054534c Help: Mention INTERFACE_SOURCES as settable for INTERFACE libs
| * | | | | Help: Link to Object Library docs from add_libraryBrad King2014-06-121-2/+2
| | | | | |
| * | | | | Help: Organize add_library command documentationBrad King2014-06-121-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a section for each library type signature. Add a table of contents at the top for the html builder.
| * | | | | Help: Update style guide to use section headers for command signaturesBrad King2014-06-121-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to be able to link to specific command signatures we need to use a section header instead of a horizontal separator.
| * | | | | Help: Organize Binary Targets section of cmake-buildsystem.7Brad King2014-06-121-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a subsection for Binary Executables just before Binary Library Types. Divide the library section into Normal Libraries and Object Libraries.
| * | | | | Help: Mention INTERFACE_SOURCES as settable for INTERFACE libsBrad King2014-06-122-4/+6
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | The add_library(INTERFACE) and Interface Libraries documentation list all the INTERFACE_* properties and target_* commands that can be used to define the interface. Add INTERFACE_SOURCES and target_sources() to these lists for completeness.
* | | | | Merge topic 'add_jacoco_coverage_parsing'Brad King2014-06-139-1/+348
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 558c2190 CTest: Add Jacoco Coverage functionality
| * | | | | CTest: Add Jacoco Coverage functionalityJoseph Snyder2014-06-129-1/+348
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to parse the XML output of the Jacoco tool. Jacoco (www.eclemma.org/jacoco) is a Java coverage tool. Add and integrate a class for the parser and include a test which utilizes the new parser.
* | | | | | Merge topic 'setlocale'Brad King2014-06-134-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | c746b00e Encoding: Change to only set LC_CTYPE to fix encoding issues with libarchive.
| * | | | | | Encoding: Change to only set LC_CTYPE to fix encoding issues with libarchive.Clinton Stimpson2014-06-124-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changing all categories with LC_ALL causes test failures in some locales. For example, in some locales, the decimal characer could be a comma instead of period.
* | | | | | | CMake Nightly Date StampKitware Robot2014-06-131-1/+1
| |_|/ / / / |/| | | | |
* | | | | | Merge topic 'doc-WCDH-align-macros'Brad King2014-06-121-0/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 34f95bcf WCDH: Document the alignof and alignas wrapper macros.
| * | | | | | WCDH: Document the alignof and alignas wrapper macros.Stephen Kelly2014-06-101-0/+10
| | | | | | |
* | | | | | | Merge topic 'hpux-ProcessorCount'Brad King2014-06-121-0/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dbc0f63d ProcessorCount: Update for HPUX 11iv3
| * | | | | | | ProcessorCount: Update for HPUX 11iv3Eric Berge2014-06-101-0/+4
| | | | | | | |
* | | | | | | | Merge topic 'dev/variable-lookup'Brad King2014-06-123-22/+35
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e17a69bc cmDefinitions: Use a hashmap for faster checks 3b21705d cmDefinitions: Avoid a find-then-insert when setting variables 5abfde6c cmDefinitions: Don't store parent lookups
| * | | | | | | cmDefinitions: Use a hashmap for faster checksBen Boeckel2014-06-092-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The hash map is much faster at checking that the map won't have what we're looking for so that we can just go to the parent scope instead.
| * | | | | | | cmDefinitions: Avoid a find-then-insert when setting variablesBen Boeckel2014-06-091-10/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Searching the map is not necessary.
| * | | | | | | cmDefinitions: Don't store parent lookupsBen Boeckel2014-06-093-10/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When looking up scopes, it is faster to not store the lookup locally to keep the maps smaller and avoid extra allocations and rebalancing.
* | | | | | | | CMake Nightly Date StampKitware Robot2014-06-121-1/+1
| | | | | | | |
* | | | | | | | CMake Nightly Date StampKitware Robot2014-06-111-1/+1
| |/ / / / / / |/| | | | | |
* | | | | | | Merge branch 'release'Brad King2014-06-100-0/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | CMake 3.0.0v3.0.0Brad King2014-06-091-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge topic 'WriteCompilerDetectionHeader-compiler-versions'Brad King2014-06-1030-94/+184
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ddec418a Features: Add compiler version support to WriteCompilerDetectionHeader. b7029576 Project: Add configurable name for version computation macros. 78acaafe Project: Separate simulated compiler id from version detection. 567af1a5 WCDH: Issue a better message for version compatibility.
| * | | | | Features: Add compiler version support to WriteCompilerDetectionHeader.Stephen Kelly2014-06-093-1/+69
| | | | | |
| * | | | | Project: Add configurable name for version computation macros.Stephen Kelly2014-06-0526-87/+89
| | | | | |
| * | | | | Project: Separate simulated compiler id from version detection.Stephen Kelly2014-06-053-3/+14
| | | | | |
| * | | | | WCDH: Issue a better message for version compatibility.Stephen Kelly2014-06-052-3/+12
| | | | | |
* | | | | | Merge topic 'no-parse-directory'Brad King2014-06-104-1/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | b1c113d9 cmake: Do not open directories as scripts (#14966)
| * | | | | | cmake: Do not open directories as scripts (#14966)Brad King2014-06-094-1/+6
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Check if a file path is a directory before opening it. Extend the RunCMake.CommandLine test with a case running "cmake -P" on a directory.