summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
|\ \
| * | tests: add tests for querying propertiesBen Boeckel2015-01-1117-0/+161
| | |
| * | set_tests_properties: fix documentationBen Boeckel2015-01-111-1/+1
| | | | | | | | | | | | The error is raised if the *test* doesn't exist, not the property.
| * | get_test_property: clarify the documentationBen Boeckel2015-01-111-4/+4
| | | | | | | | | | | | | | | If either the test or the property doesn't exist, NOTFOUND will be used. No error is raised in either case.
| * | get_target_property: discern empty from undefined properties (#15333)Stephen Kelly2015-01-111-1/+4
| |/ | | | | | | | | This was accidentally regressed by commit v3.1.0-rc1~812^2~50 (stringapi: Use strings for property names, 2013-09-02).
* | Merge branch 'FindSDL-quoting' into releaseBrad King2015-01-081-1/+1
|\ \
| * | FindSDL: Allow if() to dereference SDL_INCLUDE_DIR for matchingRolf Eike Beer2015-01-081-1/+1
| | | | | | | | | | | | Otherwise the syntax is incorrect when the variable is empty.
* | | Merge branch 'FindCUDA-cross' into releaseBrad King2015-01-081-2/+2
|\ \ \
| * | | FindCUDA: Do not assume CMAKE_SYSTEM_PROCESSOR is setMark Abraham2015-01-081-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | CMAKE_SYSTEM_PROCESSOR is not guaranteed to be defined (per http://www.cmake.org/Wiki/CMake_Cross_Compiling), and when cross compiling where it happens to be undefined, this module was broken. Reviewed-by: Rolf Eike Beer <eike@sf-mail.de>
* | | Merge branch 'FindIce-CMP0054' into releaseBrad King2015-01-081-5/+5
|\ \ \
| * | | FindIce: Port to work with CMP0054 NEW behaviorRolf Eike Beer2015-01-081-5/+5
| | |/ | |/| | | | | | | Do not quote if() arguments meant to test variable definitions.
* | | Merge branch 'doc-CXX_STANDARD-14' into releaseBrad King2015-01-081-1/+1
|\ \ \
| * | | Help: Document valid 14 value for CXX_STANDARD. (#15339)Stephen Kelly2015-01-081-1/+1
| | |/ | |/| | | | | | | | | | | | | Support was added in commit v3.1.0-rc1~475^2 (Features: Add support for C++14 features., 2014-05-06), but the documentation for this property was not amended.
* | | Merge branch 'doc-if-variable-not-defined' into releaseBrad King2015-01-081-4/+5
|\ \ \
| * | | Help: Clarify if(<variable>) documentation (#15335)Brad King2015-01-081-4/+5
| | |/ | |/| | | | | | | | | | When the variable is not defined the signature is actually accepting a string. Also clarify fall-through from if(<constant>) case.
* | | Merge branch 'kwsys-Terminal-xterm-termite' into releaseBrad King2015-01-081-0/+1
|\ \ \
| * | | KWSys Terminal: Add xterm-termite to VT100 color support whitelistSimon Gomizelj2015-01-081-0/+1
| |/ /
* | | Merge branch 'doc-octothorpe-escaping' into releaseBrad King2014-12-241-0/+22
|\ \ \
| * | | Help: Add 3.1 release note about '#' escaping in Makefiles (#15322)Brad King2014-12-231-0/+22
| |/ / | | | | | | | | | | | | | | | | | | | | | The change in commit v3.1.0-rc1~174^2 (Makefile: Handle '#' in COMPILE_OPTIONS, 2014-08-12) was not compatible with code that tries to workaround the original bug. Unfortunately there is no good way to fix the bug in a compatible way. Add a release note to call attention to the change.
* | | Merge branch 'ninja-fix-subdir-objlib-languages' into releaseBrad King2014-12-246-2/+25
|\ \ \ | |_|/ |/| |
| * | Tests: Test using objects from a language enabled in a subdirectory (#15325)Brad King2014-12-225-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | Add a test case that enables CXX in the top level and C in a subdirectory. Create an executable in the top level that uses C objects compiled in the subdirectory. Strictly speaking this is not defined behavior for all language combinations, but happens to work in this case. Test this behavior since projects might try to use it.
| * | Ninja: Generate rules only for languages compiled in a target (#15325)Brad King2014-12-221-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.1.0-rc1~688^2~2 (cmTarget: Compute languages from object libraries on demand, 2014-03-18) taught cmTarget::GetLanguages to (correctly) include the languages of object library sources. Previously this was done only in cmTarget::ComputeLinkImplementationLanguages to choose the linker language. The Ninja generator writes out generic build rules for each language compiled within a target using the rule variables defined in the directory of the target. This only needs to be done for languages actually compiled within the current target. Switch from using the cmTarget::GetLanguages method to get the list of languages over to using cmTarget::GetSourceFiles directly so we do not get the languages in object libraries. Strictly speaking this should make no difference because it is not safe to use objects from a language not enabled in the directory containing a target or else the link information for the language may not be considered. However, in cases when no link information happens to be needed for a language it was possible in CMake 3.0 and below to enable a language only in a subdirectory providing an object library, and then use the objects from a containing directory. The above change teaches the Ninja generator to continue working in this case.
* | | Merge branch 'ninja-fix-crash-on-error' into releaseBrad King2014-12-221-1/+4
|\ \ \ | |/ /
| * | Ninja: Do not crash when CMAKE_<LANG>_COMPILE_OBJECT is empty (#15325)Brad King2014-12-221-1/+4
| |/