summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | VS: Change Nsight Tegra 2.0 Project Revision Number from 8 to 9Dmitry Polyanitsa2014-11-131-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | A hotfix to Nsight Tegra 2.0 needed to increase the project number. Teach CMake to generate the newer number for this version.
* | | | | Merge branch 'no-cmake-self-install-when-cross-compiling' into releaseBrad King2014-11-131-1/+2
|\ \ \ \ \
| * | | | | Do not use just-built CMake to install itself when cross-compiling (#15248)Brad King2014-11-131-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | The special case added by commit v2.4.0~3051 (When building CMake itself, use the new cmake to install so that the current cmake can be overwritten, 2004-06-09) does not make sense when cross-compiling.
* | | | | Merge branch 'no-AppleClang-C-features' into releaseBrad King2014-11-131-1/+2
|\ \ \ \ \
| * | | | | Features: Don't record for AppleClangStephen Kelly2014-11-121-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Features are currently recorded accidentally for all versions of AppleClang > 3.4 (I have no idea how that relates to upstream Clang). Presumably that version has the features which are accidentally recorded, but in the future features will be recorded initially for only AppleClang >= 5.1, which would appear as a feature regression. Commit v3.1.0-rc1~635^2~11 (Don't load Clang-CXX from AppleClang-CXX., 2013-11-11) ajusted the logic for the CXX language. Make a similar change for the C language.
* | | | | | Merge branch 'doc-install-SCRIPT-CODE-COMPONENT' into releaseBrad King2014-11-131-1/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Help: Document COMPONENT option of install(SCRIPT/CODE) (#14956)Brad King2014-11-131-1/+2
| | |/ / / | |/| | |
* | | | | CMake 3.1.0-rc2v3.1.0-rc2Brad King2014-11-121-1/+1
| |/ / / |/| | |
* | | | Merge branch 'emacs-mode-underscore-in-symbol' into releaseBrad King2014-11-122-2/+5
|\ \ \ \
| * | | | Help: Add 3.1 release note Emacs mode updateBrad King2014-11-121-0/+4
| | | | |
| * | | | cmake-mode.el: syntax of '_' should be treated as symbolSyohei YOSHIDA2014-11-121-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Word commands, such as foward-word(M-f), backward-kill-word(M-backspace), don't work well like other major-modes if syntax of '_' is treated as "word". Tested-by: Guillaume Papin <guillaume.papin@parrot.com>
* | | | | Merge branch 'kwsys-SystemInformation-AIX-_SC_AIX_REALMEM' into releaseBrad King2014-11-121-1/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | KWSys SystemInformation: Check for _SC_AIX_REALMEM before using itÅdne Hovda2014-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Add a check for supported flag when querying for system memory on AIX 5.1.
* | | | | Merge branch 'doc-CMAKE_INSTALL_PREFIX-link-GNUInstallDirs' into releaseBrad King2014-11-121-0/+5
|\ \ \ \ \
| * | | | | Help: Link to GNUInstallDirs from CMAKE_INSTALL_PREFIX (#15246)Brad King2014-11-121-0/+5
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | Add a note to the CMAKE_INSTALL_PREFIX documentation that refers readers to the GNUInstallDirs module to make the latter easier to discover.
* | | | | Merge branch 'doc-index-xrefs' into releaseBrad King2014-11-122-3/+47
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Utilities/Sphinx: Add index entries for cross-referencesBrad King2014-11-122-3/+47
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Add a document transform to insert index and target nodes just before any CMake domain cross-reference node. This will make references to CMake domain objects appear in the index. Also add a comment explaining why it cannot be done in a result_nodes method of the CMakeXRefRole.
* | | | Merge branch 'fix_link-line-dedup_regression' into releaseBrad King2014-11-116-4/+46
|\ \ \ \
| * | | | Fix link line order when shared libraries are de-duplicatedDaniele E. Domenichelli2014-11-106-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~227^2~1 (De-duplicate shared library targets in generated link lines, 2014-07-30) we de-duplicate shared library targets on the link line. However, some toolchains will fail linking if an executable is linking to a shared library that is not used directly and a static library that depends on the shared one. The linker may not keep the reference to the shared library the first time and then the symbols needed by the static library may not be found. Fix this by reversing the direction of the for loop that removes the duplicate shared libraries, in order to ensure that the last occurrence of the library is left instead of the first one. Extend Tests/Dependency with a case covering this behavior. Create an executable that links to a shared library and a static library but only needs the shared library as a dependency of the static library. Co-Author: Brad King <brad.king@kitware.com>
* | | | | Merge branch 'ExternalProject-check-hash-before-download' into releaseBrad King2014-11-101-1/+14
|\ \ \ \ \
| * | | | | ExternalProject: Restore logic to not download already-existing fileBrad King2014-11-101-1/+14
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.1.0-rc1~85^2 (ExternalProject: Fix download retry logic, 2014-09-13) dropped the file(DOWNLOAD) EXPECTED_HASH argument. This prevents file(DOWNLOAD) from skipping the download if the output file already exists with the proper hash. Restore this check with explicit code in the download script. Reported-by: Ruslan Baratov <ruslan_baratov@yahoo.com>