summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* FindPythonInterp: fix version component variables for Python 1.4 (#15275)Rolf Eike Beer2014-12-021-2/+2
| | | | | This bug was introduced in "FindPythonInterp: rework the version detection" 7d6db93de9ffc6e6092fa722aaf9c057dadcd634.
* Merge branch 'doc-ctest-j-typo' into releaseBrad King2014-12-011-1/+1
|\
| * Help: Add missing space to ctest -j option descriptionChristopher Dembia2014-12-011-1/+1
| |
* | Merge branch 'target-sources-error-conditions' into releaseBrad King2014-12-0119-8/+93
|\ \
| * | Help: Document the export limitation of INTERFACE_SOURCES.Stephen Kelly2014-11-292-0/+8
| | |
| * | Export: Disallow export of targets with INTERFACE_SOURCESStephen Kelly2014-11-299-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This can be allowed in the next release, but it needs to have some features present and tested such as * Ensuring that relative paths do not appear in the generated property. * Ensuring that paths to the source or build directories do not appear. * Generating a check in the file for CMake 3.1 or later so that the resulting property will be consumed. * Ensuring that any referenced targets are part of an export set and generating a check for them. * INSTALL_INTERFACE and BUILD_INTERFACE content. All of these checks are already done for INTERFACE_INCLUDE_DIRECTORIES, but it is too late to add them for INTERFACE_SOURCES for CMake 3.1. As the checks introduce some new error conditions, it is better to disallow exporting fully for this case and introduce proper error conditions later instead of policies.
| * | cmTarget: Don't allow relative paths in INTERFACE_SOURCESStephen Kelly2014-11-299-8/+47
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Follow the pattern of checks that are made for INTERFACE_INCLUDE_DIRECTORIES. Existence is already checked by cmSourceFile::GetFullPath. Add a check to disallow relative paths in source directories. Otherwise code such as target_sources(lib1 INTERFACE foo.cpp) would fail if consumed by a target in a different directory. Unlike the INTERFACE_INCLUDE_DIRECTORIES behavior, we don't care whether the entry comes from an IMPORTED target or not. In the include directories case, the directory for a non-imported target might not exist yet but might be created. In the sources case, a file which does not yet exist in the filesystem must be explicitly marked with the GENERATED property. Adjust existing tests and add a new test for the error.
* | Merge branch 'fix-transitive-OBJECT_SOURCES-context' into releaseBrad King2014-12-012-35/+44
|\ \
| * | Genex: Fix evaluation context propagation for TARGET_OBJECTS.Stephen Kelly2014-11-262-35/+44
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extract a new method to encapsulate the requirements of evaluating dependent-expressions, namely, propagation of the EvaluateForBuildsystem setting, which is missing from the getLinkedTargetsContent implementation. Commit v3.1.0-rc1~688^2 (Genex: Only evaluate TARGET_OBJECTS to determine target sources., 2014-03-20) introduced an error case for use of TARGET_OBJECTS outside of the context of generating the buildsystem, as the path to object files may be dependent on buildsystem variables (See bug #15226). Commit v3.1.0-rc1~314^2 (Allow INTERFACE_SOURCES to specify $<TARGET_OBJECTS> (#14970), 2014-07-09) made it possible to propagate such content to dependent targets. While that commit propagated the EvaluateForBuildsystem setting for the case of a TARGET_PROPERTY expression, as generated for direct dependencies of a target in cmTargetInternals::AddInterfaceEntries, it did not add propagation for content from further transitive target dependencies, as determined by getLinkedTargetsContent.
* | Merge branch 'doc-installed-file-property' into releaseBrad King2014-12-013-28/+69
|\ \
| * | Help: Add 3.1 release notes for INSTALL property scopeBrad King2014-12-011-0/+6
| | |
| * | Help: Document installed file property APINils Gladitz2014-12-012-0/+21
| | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~479^2~1 (Add an "installed file" property scope, 2014-05-15) the get_property and set_property commands support an 'INSTALL' scope. Add documentation for this scope.
| * | Help: Format set_property and get_property command docsBrad King2014-12-012-28/+42
| | |
* | | Merge branch 'doc-CMP0053-dedup-char' into releaseBrad King2014-12-011-1/+1
|\ \ \
| * | | Help: Remove duplicate '#' in CMP0053 valid character listChristoph GrĂ¼ninger2014-12-011-1/+1
| | |/ | |/|
* | | Merge branch 'fix-source-case-matching' into releaseBrad King2014-11-261-1/+2
|\ \ \
| * | | Fix lookup of source names after conversion to their actual case (#15259)Brad King2014-11-261-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~688^2~15 (cmTarget: Add a method to obtain list of filenames for sources, 2014-03-17) we have code paths that lookup sources by strings containing their own full path after normalization to the actual case on disk. This fails in the case that a cmSourceFile has already been created with a different case in the filename. The comparison of the directory works because it is always normalized. Only the comparison of the file name fails. Fix this by using a case-insensitive comparison of source file names on platforms that do not have case-sensitive filesystems.
* | | Merge branch 'revert-cached-regex-clear' into releaseBrad King2014-11-265-60/+43
|\ \ \
| * | | Revert "ClearMatches: Only clear matches which were actually set" (#15261)Ben Boeckel2014-11-265-60/+43
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit v3.1.0-rc1~557^2~2 (ClearMatches: Only clear matches which were actually set, 2014-03-12). The optimization did not track the match count in the same scope as the variables, allowing possible inconsistency. Resolve conflicts in Source/cmIfCommand.cxx, Source/cmMakefile.cxx, and Source/cmMakefile.h by moving the changes to the new location of the code involved.
* | | Merge branch 'FindwxWidgets-new-versions' into releaseBrad King2014-11-261-0/+2
|\ \ \ | |/ / |/| |
| * | FindwxWidgets: Add versions 3.0.1 and 3.0.2Christopher Gittner2014-11-261-0/+2
| |/
* | Merge branch 'C-features-Wundef' into releaseBrad King2014-11-264-4/+18
|\ \
| * | WCDH: Make the header -Wundef safe for the C language.Stephen Kelly2014-11-254-4/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | The __STDC_VERSION__ macro may be defined or not depending on the implementation dialect of C. Test that it is defined before testing its value. The CXX tests do not need such a change because they define __cplusplus in all dialects.
* | | Merge branch 'fix-WCDH-docs' into releaseBrad King2014-11-251-1/+1
|\ \ \
| * | | WCDH: Don't imply that MSVC is supported by the module.Stephen Kelly2014-11-231-1/+1
| |/ / | | | | | | | | | Remove the mention of it from the docs.
* | | Merge branch 'fix-GNU-CXX-dialect-versions' into releaseBrad King2014-11-251-4/+3
|\ \ \
| * | | Features: Record C++11 dialect switch only for GNU 4.7 and later.Stephen Kelly2014-11-191-4/+3
| |/ / | | | | | | | | | | | | Previous versions of GNU are not currently supported by this CMake feature.
* | | Merge branch 'default-lang-dialect' into releaseBrad King2014-11-257-47/+113
|\ \ \
| * | | Fix the test for running the CxxDialog unit test.Stephen Kelly2014-11-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing versions have been used since commit v3.1.0-rc1~635^2~8 (cmTarget: Add CXX_STANDARD and CXX_EXTENSION target properties., 2013-10-13), but further discussions since then increased the initial minimum compiler versions this feature is available for.
| * | | Features: Fix the default C dialect for Clang and GNU.Stephen Kelly2014-11-206-15/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang 3.4 uses C99 by default, and Clang 3.6 uses C11 by default: http://thread.gmane.org/gmane.comp.compilers.clang.devel/39379 GNU 4.9 uses C90 by default, and GNU 5.0 uses C11 by default: https://gcc.gnu.org/gcc-5/changes.html Test that the default compiler settings result in the expected dialect macros being defined for both C and CXX. Remove the unused main.c file from the CompileFeatures unit test.
| * | | Features: Fix references to CXX compiler version in Clang-C.cmake.Stephen Kelly2014-11-181-2/+2
| | | |
| * | | Features: Test the CXX compiler only if it has features.Stephen Kelly2014-11-181-28/+30
| |/ / | | | | | | | | | | | | If using different C and CXX compilers, we might not have a feature-full CXX compiler at this point.
* | | Merge branch 'fix-openmp-fortran' into releaseBrad King2014-11-201-5/+5
|\ \ \
| * | | FindOpenMP: Use fixed form Fortran test programNils Gladitz2014-11-201-5/+5
| |/ / | | | | | | | | | | | | | | | This prevents the test program from failing when build as Fortran 77. Suggested-by: Alin Marin Elena <alinm.elena@gmail.com>
* | | Merge branch 'backport-fix-CMP0054-MSVC' into releaseBrad King2014-11-205-12/+12
|\ \ \
| * | | Avoid if() quoted auto-dereference when checking for "MSVC"Fraser Hutchison2014-11-195-12/+12
| | | | | | | | | | | | | | | | | | | | When testing CMAKE_<LANG>_COMPILER_ID values against "MSVC", do not allow the definition of the "MSVC" variable to be expanded.
* | | | Merge branch 'FindJava-no-osx-stub' into releaseBrad King2014-11-191-1/+4
|\ \ \ \
| * | | | FindJava: Do not accept OS X stub 'java' as JavaBrad King2014-11-191-1/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | OS X provides a stub 'java' to inform callers that Java is not present. When checking the 'java -version' output, look for such a message and if found pretend 'java' was not found. Suggested-by: Sean McBride <sean@rogue-research.com>
* | | | Merge branch 'vs-check-phone-store-tools' into releaseBrad King2014-11-177-35/+242
|\ \ \ \
| * | | | VS: Do not produce WinMD file for OBJECT libraries (#15228)Gilles Khouzam2014-11-171-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | They are implemented as static libraries for the IDE so treat them the same.
| * | | | VS: Improve error messages when compiler is not detected (#15228)Gilles Khouzam2014-11-146-34/+240
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | CMake requires both the Desktop SDK and the correct platform SDK (Windows Phone or Windows Store) to be installed when targeting the Windows mobile platforms. Verify that the right platform components are installed and give a more detailed error message when something is wrong.
* | | | Merge branch 'doc-sphinx-cmake-fixup' into releaseBrad King2014-11-171-0/+1
|\ \ \ \
| * | | | Utilities/Sphinx: Add missing call to note_explicit_targetBrad King2014-11-171-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sphinx calls document.note_explicit_target with any nodes.target() it creates. Add such a call when we create a document target in CMakeTransform.
* | | | | Merge branch 'doc-target_include_directories-fixup' into releaseBrad King2014-11-171-2/+2
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Help: target_include_directories does not allow target namesBrad King2014-11-171-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.11~227^2~1 (Don't allow targets args in the new target commands, 2013-01-29) the target_include_directories command does not support target names on the right hand side, but that commit forgot to remove it from the docs. It was never released with such support. Update the command documentation now.
* | | | Merge branch 'vs14-is-2015' into releaseBrad King2014-11-175-18/+38
|\ \ \ \
| * | | | VS: Rename VS 14 generator to 'Visual Studio 14 2015'Brad King2014-11-145-18/+38
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Now that we know the year component of this VS version we can add it to the generator name. For convenience, map the name without the year to the name with the year.
* | | | Merge branch 'kwsys-SharedForward-vs14' into releaseBrad King2014-11-171-1/+1
|\ \ \ \
| * | | | KWSys SharedForward: Hard-code the ldpath buffer size to below VS 14 limitBrad King2014-11-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visual Studio 14 (2015) complains if a static character array is declared with more than 65535 elements. This limit should be large enough for SharedForward clients, so just hard-code that instead of trying to compute a limit.
* | | | | Merge branch 'vs-nsight-tegra-version' into releaseBrad King2014-11-131-2/+2
|\ \ \ \ \