summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Normalize OBJECT_DEPENDS paths to match custom commands (#15366)Brad King2015-01-285-0/+35
| | | | | | | | | | Custom command path normalization added in commit v3.1.0-rc1~471^2 (add_custom_command: Normalize OUTPUT and DEPENDS paths, 2014-05-28) broke use of OBJECT_DEPENDS to bring in custom commands because the latter paths were not normalized too. Normalize them and add a test case. Reported-by: Daniel v. Gerpen
* CMake 3.1.1v3.1.1Brad King2015-01-201-1/+1
|
* Merge branch 'doc-virtual-override-specifiers-links' into releaseBrad King2015-01-191-2/+7
|\
| * Help: Link relevant documents for virtual override features (#15311)Stephen Kelly2015-01-191-2/+7
| |
* | Merge branch 'xcode-target-sort' into releaseBrad King2015-01-192-14/+54
|\ \
| * | Xcode: Sort targets deterministically and with ALL_BUILD first (#15346)Ben Boeckel2015-01-191-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The default target in XCode is the first one in the file. In commit v3.1.0-rc1~286^2 (cmTarget: use a hash_map for cmTargets typedef, 2014-06-10) the order of the targets stored in cmMakefile was made non-deterministic instead of lexicographic. Teach the Xcode generator to do its own sorting to restore a predictable order. While at it, place ALL_BUILD first (as is done in VS IDE generators) explicitly in the comparison function so that it is the default target even if other targets sort earlier lexicographically (e.g. "AAA").
| * | Xcode: Fix early termination on per-config source file errorBrad King2015-01-192-13/+29
| |/ | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~687^2~4 (cmTarget: Make the source files depend on the config, 2014-02-13) an early termination case was added to the Xcode generator. Fix handling of this case to actually abort all the generation steps. Otherwise some of the later steps are attempted without the preconditions normally established by earlier steps, possibly leading to a crash.
* | Merge branch 'emacs-mode-fix-word-at-point' into releaseBrad King2015-01-191-0/+1
|\ \
| * | cmake-mode.el: Re-add explicit call to require thingatptPeter Vasil2015-01-191-0/+1
| | | | | | | | | | | | | | | | | | Usually it is not needed to call '(require 'thingatpt')' explicitly because the function 'symbol-at-point' is in autoloaded but to be sure to have the function loaded in every case, require thingatpt.
* | | Merge branch 'emacs-mode-fix-word-at-point' into releaseBrad King2015-01-191-3/+7
|\ \ \ | |/ /
| * | cmake-mode.el: Fix extracting keyword at point in cmake-helpPeter Vasil2015-01-191-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc2~1^2~1 (cmake-mode.el: syntax of '_' should be treated as symbol, 2014-11-12) the 'word-at-point' function does not extract the whole keyword anymore if it contains an '_', because 'forward-word' stops at '_'. Use 'symbol-at-point' to extract a whole keyword even if there is an '_'.
* | | Merge branch 'FindQt-fixes' into releaseBrad King2015-01-161-3/+10
|\ \ \
| * | | FindQt: explicitely mention that it cannot Qt5 or laterRolf Eike Beer2015-01-161-0/+3
| | | |
| * | | FindQt: fix variable name in error messageRolf Eike Beer2015-01-161-2/+2
| | | |
| * | | FindQt: fix setting DESIRED_QT_VERSION if "find_package(Qt VVV)" was calledRolf Eike Beer2015-01-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In case the given version was not only "3" or "4", but something like "4.8" DESIRED_QT_VERSION was set to an unsupported value. While at it also check that the version passed in is really in the range of 3.x and 4.x. Also suggest switching to the more specific find modules if possible.
* | | | Merge branch 'fix-cmake-org-links' into releaseBrad King2015-01-163-4/+4
|\ \ \ \
| * | | | Help: Update cmake.org links to avoid redirectsWilliam Lynch2015-01-163-4/+4
| | |_|/ | |/| | | | | | | | | | Some links to cmake.org now redirect, so link to the new pages directly.
* | | | Merge branch 'release-3.0' into releaseBrad King2015-01-161-0/+1
|\ \ \ \
| * \ \ \ Merge branch 'eclipse-fix-cxx-natures' into release-3.0Brad King2015-01-161-0/+1
| |\ \ \ \
| | * | | | Eclipse: Add org.eclipse.cdt.core.cnature to CXX projects (#15068)André Klitzing2015-01-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.0.0-rc1~335^2~1 (eclipse: Add natures for Eclipse based on enabled languages, 2013-08-29) CXX projects got only "ccnature", but Eclipse itself also adds "cnature" when creating C++ projects. Fix this by adding both for CXX projects.
* | | | | | Merge branch 'fix-qcc-compiler-id' into releaseBrad King2015-01-153-3/+3
|\ \ \ \ \ \
| * | | | | | QNX: Fix detection of QCC compiler id (#15349)Brad King2015-01-143-3/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~113^2 (Use a more reliable regex for extracting binary INFO strings, 2014-09-03) the matching of INFO: strings was made more strict and no longer matches just "INFO:qnxnto". Use "INFO:qnxnto[]" instead to conform to the new pattern.
* | | | | | Merge branch 'fix-COMPILE_FEATURES-genex' into releaseBrad King2015-01-153-9/+17
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Features: Fix the COMPILE_FEATURES genex for unavailable features.Stephen Kelly2015-01-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the genex tested only for CMake knowledge of the feature, but not compiler knowledge of the feature.
| * | | | | cmMakefile: Rename a method to what it really does.Stephen Kelly2015-01-123-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | The method does not test availability of compile features.
* | | | | | Merge branch 'cpack-PackageMaker-OSX-10.10' into releaseBrad King2015-01-152-10/+26
|\ \ \ \ \ \
| * | | | | | CPack: Fix PackageMaker internal versioning for OS X 10.10Calin Cascaval2015-01-122-10/+26
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | Avoid using a floating point value to represent the version, since "10.10" would be treated as "10.1".
* | | | | | Merge branch 'fix-LOCATION-with-TARGET_OBJECTS' into releaseBrad King2015-01-145-0/+21
|\ \ \ \ \ \
| * | | | | | cmTarget: Compute link language of TARGET_OBJECTS with CMP0026 OLD (#15338)Stephen Kelly2015-01-135-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.1.0-rc1~297^2~5 (cmTarget: Drop 'head' argument from GetSourceFiles, 2014-07-10) exposed a dormant bug in source file computation, causing the test case to regress. After that commit, the source file computation and caching finds an existing container of source files. Prior to that patch, the GetSourceFiles method was called with either a null pointer for the head cmTarget, or it was called with the this pointer. The processSources method is eventually called, which normalizes the difference between the null pointer and the this pointer for the head target. However, the cache key depends on the actual pre-normalized pointer. The change in that commit caused the entry to be found in the cache where it was not before, which resulted in incorrect behavior. Prior to that commit, the test case also fails if the GetSourceFiles overload taking a vector<cmSourceFile*> is changed to normalize the head target at the beginning of the method: cmTarget const* head = head_ ? head_ : this; Such a construct was correctly used in other locations where similar caching was in place, before being removed in commit v3.1.0-rc1~310^2~25 (cmTarget: Remove 'head' argument from GetLinkInformation, 2014-06-12), but is not neccessary anymore. Commit v3.1.0-rc1~674^2~2 (cmTarget: Cache the cmSourceFiles in GetSourceFiles., 2014-04-05) introduced the caching, but fails the test case for an unrelated reason. That unrelated error was introduced in commit v3.1.0-rc1~688^2~5 (cmTarget: Allow any generator expression in SOURCES property., 2014-03-18) and fixed in commit v3.1.0-rc1~561^2~1 (cmTarget: Fix listing of source files at configure-time., 2014-04-13). All commits which fail the test case in the testable way do so when such a cached version of the source files is found and returned at generate time. In the test case, the cached content is populated at configure-time through the use of the deprecated LOCATION property with CMP0026 OLD. The cached content is an empty container for the bar target in the test case, because its source file 'foo.cpp.o' is not known until generate-time. That means that no source files are available to compute the link language and the reported error is issued. The actual problem is that the SourceFilesMap should be cleared after configure time by cmTarget::ClearLinkMaps. Clear it there now.
* | | | | | | Merge branch 'FindRuby-zero-version' into releaseBrad King2015-01-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | FindRuby: fix selection of version x.0 (#15345)David Coppa2015-01-121-1/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | When "Ruby_FIND_VERSION_MINOR" is 0, the "if(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR)" check evaluated to false.
* | | | | | | Merge branch 'FindRuby-fix-version' into releaseBrad King2015-01-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | FindRuby: Fix output check in _RUBY_CONFIG_VAREvangelos Foutras2015-01-111-1/+1
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.8~173^2 (FindRuby: clean up querying variables from Ruby, 2012-02-17) we query RbConfig::CONFIG first and, if the command fails or its output equates to a false constant, then fall back to querying Config::CONFIG. Due to the above, an error condition exists with Ruby 2.2.0; when querying RbConfig::CONFIG['TEENY'], the output of '0' will be discarded since it matches the false constant '0'. In previous versions this wasn't a problem, but Ruby 2.2 has completely removed Config::CONFIG. This causes RUBY_VERSION_PATCH to be set to an empty string and the Ruby version to be detected as '2.2.' (instead of '2.2.0'). Fix the output check to explicitly look for an empty string before using the fallback query method. (Someone more familiar with Ruby might be able to deem the fallback as unnecessary and fully remove it.)
* | | | | | | Merge branch 'FindBoost-update-versions' into releaseBrad King2015-01-141-1/+1
|\ \ \ \ \ \ \
| * | | | | | | FindBoost: Add latest Boost version 1.57.0 and next milestone 1.58.0Sergey Nikulov2015-01-131-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'backport-cpack_invalid_cmake_generator' into releaseBrad King2015-01-141-0/+8
|\ \ \ \ \ \ \
| * | | | | | | CPack: Avoid crash on invalid CMake generator name (#15308)Domen Vrankar2015-01-141-0/+8
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Case where CPACK_CMAKE_GENERATOR value is non existent or or contains multiple words that were not quoted was not handled and produced a segmentation fault.
* | | | | | | Merge branch 'linux-XL-fortran' into releaseBrad King2015-01-143-0/+3
|\ \ \ \ \ \ \
| * | | | | | | XL: Fix link flags for executables on Linux with XL compilersBrad King2015-01-123-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "-Wl,-export-dynamic" with XL to match the "-rdynamic" flag used with GNU-like compilers.
* | | | | | | Merge branch 'backport-copyright-year' into releaseBrad King2015-01-121-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Copyright.txt: Update year range to end in 2015Brad King2015-01-121-1/+1
| |/ / / / / /
* | | | | | | Merge branch 'xcode-ios-compiler-id' into releaseBrad King2015-01-122-6/+1
|\ \ \ \ \ \ \
| * | | | | | | Xcode: Do not require code signing for compiler id (#15214)Brad King2015-01-112-6/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The approach in commit v3.1.0-rc1~1^2 (Xcode: Fix compiler id detection when code signing is required, 2014-10-22) still requires a code signing key when targeting a real device. Instead set CODE_SIGNING_REQUIRED to "NO" to tell Xcode not to sign at all. Drop the corresponding setting of the code signing identity.
* | | | | | | Merge branch 'doc-CMAKE_FIND_PACKAGE_NAME' into releaseBrad King2015-01-123-0/+9
|\ \ \ \ \ \ \
| * | | | | | | Help: Document CMAKE_FIND_PACKAGE_NAME variableBrad King2015-01-112-0/+7
| | | | | | | |
| * | | | | | | find_package: Document CMAKE_FIND_PACKAGE_NAME variableGregor Jasny2015-01-111-0/+2
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Gregor Jasny <gjasny@googlemail.com>
* | | | | | | Merge branch 'fix-autouic-regression' into releaseBrad King2015-01-123-1/+10
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | QtAutoUic: Add a test for the regression in the parent commit.Stephen Kelly2015-01-122-0/+9
| | | | | | |
| * | | | | | QtAutoUic: Restore source file AUTOUIC_OPTIONS settingsJustin Borodinsky2015-01-111-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "." in the extension was dropped by commit v3.1.0-rc1~556^2~2 (cmSourceFile: Cache the isUiFile check, 2014-02-08) by mistake. This caused the options to not be set.
* | | | | | Merge branch 'fix-empty-target-property-queries' into releaseBrad King2015-01-1120-6/+170
|\ \ \ \ \ \
generated by cgit v0.12 at 2025-02-10 15:14:14 (GMT)