summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.3.1v3.3.1Brad King2015-08-131-1/+1
|
* Merge branch 'compiler-version-Fortran' into releaseBrad King2015-08-051-0/+1
|\
| * Fortran: Store detected compiler version persistently (#15684)Brad King2015-08-051-0/+1
| | | | | | | | | | | | | | | | The Fortran compiler version detection infrastructure added by commit v3.3.0-rc1~436^2~9 (Fortran: Add infrastructure to detect compiler version, 2015-02-17) forgot to update CMakeFortranCompiler.cmake.in to save the compiler version persistently as we do already in "CMake{C,CXX}Compiler.cmake.in". Add the missing line now.
* | Merge branch 'fix-missing-subdir-error' into releaseBrad King2015-08-0411-2/+27
|\ \
| * | add_subdirectory: Fix error message on missing CMakeLists.txt (#15680)Brad King2015-08-0411-2/+27
| | | | | | | | | | | | | | | | | | Refactoring in commit v3.3.0-rc1~76^2 (cmMakefile: Handle CMP0014 before configuring the generator, 2015-05-14) accidentally left the file name "/CMakeLists.txt" in the error message. Remove it and add a test case.
* | | Merge branch 'fix-xcode-quoting' into releaseBrad King2015-07-311-1/+1
|\ \ \
| * | | Xcode: Quote strings containing a tilde (#15672)Gregor Jasny2015-07-311-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~183^2 (Xcode: Refine quoting rules for Strings, 2015-04-09) we no longer quote strings containing a period ('.'). However, file names like "icon29x29~ipad.png" still need quoting because they contain a tilde ('~'). Add tilde to our explicit list of characters that need quoting because such file names will no longer happen to be quoted because they contain a period.
* | | Merge branch 'ctest-add_subdirectory-crash' into releaseBrad King2015-07-271-1/+1
|\ \ \ | |/ / |/| |
| * | ctest: fix add_subdirectory() crashBen Boeckel2015-07-271-1/+1
|/ / | | | | | | | | | | The directory is at args[0], not args[1]. Introduced in commit v2.6.0~489 (... 5889 ... tests are not found in some cases when using add_subdirectory ..., 2008-01-18).
* | CMake 3.3.0v3.3.0Brad King2015-07-231-1/+1
| |
* | Merge branch 'osx-iframework' into releaseBrad King2015-07-222-0/+10
|\ \
| * | OS X: Use -iframework with AppleClang only on version >= 4.2Brad King2015-07-222-0/+10
| | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~564^2 (OS X: Use -iframework for system framework directories, 2014-05-05) we test the version of Clang to see if it supports -iframework. Fix the version test used for AppleClang since it uses a different version scheme than upstream Clang.
* | | Merge branch 'vs-compiler-feature-2015-update' into releaseBrad King2015-07-222-11/+5
|\ \ \
| * | | Features: Update MSVC features for VS 2015 RTMBrad King2015-07-212-11/+5
| |/ / | | | | | | | | | | | | VS 2015 RTM completed support for constexpr and attribute features. Update our feature table and test accordingly.
* | | Revert "CMake 3.3.0"Brad King2015-07-221-1/+1
| | | | | | | | | | | | | | | | | | This reverts commit 0e3cfc134cee5b560a636d72231cfcaeac376b85. Due to VS 2015 RTM being released, additional changes are needed to CMake 3.3.
* | | CMake 3.3.0Brad King2015-07-201-1/+1
|/ /
* | CMake 3.3.0-rc4v3.3.0-rc4Brad King2015-07-131-1/+1
| |
* | Merge branch 'fix-command-rename' into releaseBrad King2015-07-132-0/+18
|\ \
| * | cmState: Restore renamed commands on cleanup.Stephen Kelly2015-07-122-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.3.0-rc1~196^2~7 (cmake: Simplify command clean up loop., 2015-04-12) introduced a bug that built-in commands which were renamed no longer had their original name restored when cleanup is performed between configure runs. Check for that and restore the commands with their original name. Extend the complex test for this. That test is run by ctest with the --build-two-config command line option.
* | | Merge branch 'FindMPI-Intel-5' into releaseBrad King2015-07-131-1/+1
|\ \ \
| * | | FindMPI: Extend Intel-MPI 5+ workaround for recent GCCsSean Brennan2015-07-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Extend the workaround added by commit v3.2.0-rc1~278^2 (FindMPI: Workaround Intel MPI 5.0.1 exit code problem, 2014-12-04) with an additional/alternate keyword to recognize the case with recent GCCs.
* | | | Merge branch 'cpack-ifw-framework-version' into releaseBrad King2015-07-081-2/+4
|\ \ \ \
| * | | | CPackIFW: Load module to set CPACK_IFW_FRAMEWORK_VERSIONKonstantin Podsvirov2015-07-081-2/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | This setting was added to support QtIFW 2.0 in commit v3.3.0-rc1~70^2~1 (CPackIFW: Add QtIFW 2.0 support, 2015-04-27). We need to load the CPackIFW module to initialize it if it is not set.
* | | | Merge branch 'empty-LINK_LIBRARIES' into releaseBrad King2015-07-085-6/+26
|\ \ \ \
| * | | | set_property: Fix crash when setting LINK_LIBRARIES to nothingBrad King2015-07-085-6/+26
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | We use a special dedicated structure to store the LINK_LIBRARIES target property. Do not try to construct a string from a NULL value. Instead leave the property structure empty when no value is given. Reported-by: Ghyslain Leclerc <ghleclerc@gmail.com>
* | | | Merge branch 'CheckCompilerFlag-do-not-use-FLAGS' into releaseBrad King2015-07-084-12/+19
|\ \ \ \ | |_|/ / |/| | |
| * | | Check*CompilerFlag: Revert to previous method used to pass flags (#15641)Brad King2015-07-084-12/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~397^2 (Check*CompilerFlag: Refactor method used to pass flags, 2015-02-24) these check modules pass the flags to the compiler front-end during linking as well as during compilation. This breaks checks for flags like '-x c++' that are meant only for the compilation step. Revert the change and add a test covering a compiler-only flag.
* | | | Merge branch 'fortran-module-preprocessor-defs' into releaseBrad King2015-07-064-2/+9
|\ \ \ \
| * | | | Fortran: Fix passing of preprocessor definitions to dependency scannerBrad King2015-07-064-2/+9
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.3.0-rc1~352^2~3 (Genex: Allow COMPILE_LANGUAGE when processing compile definitions, 2015-03-04) the name of the variable used to pass preprocessor definitions to the Fortran dependency scanner was changed to be per-language, but the actual dependency scanning code was not updated accordingly. Update the code and add a test case. Reported-by: Radovan Bast <radovan.bast@gmail.com>
* | | | Merge branch 'FindMatlab-doc-section-headers' into releaseBrad King2015-07-061-8/+8
|\ \ \ \
| * | | | FindMatlab: Fix documentation section header underline styleTamas Kenez2015-06-291-8/+8
| |/ / / | | | | | | | | | | | | | | | | | | | | Replace caret-headers with double-quote-headers and replace dash-headers with caret-headers. This makes the headers match their level of nesting according to our documentation style guide in cmake-developers(7).
* | | | CMake 3.3.0-rc3v3.3.0-rc3Brad King2015-06-261-1/+1
| | | |
* | | | Merge branch 'fix-target_link_libraries-wrong-dir' into releaseBrad King2015-06-259-4/+17
|\ \ \ \
| * | | | cmTarget: Fix diagnostic of target_link_libraries in wrong directory (#15626)Brad King2015-06-259-4/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.3.0-rc1~62^2~5 (cmTarget: Store only cmListFileContext for CMP0023 handling, 2015-05-18) a call to target_link_libraries on a target that was defined in another (non-ancestor) directory crashes because no execution context is left active. Fix this by getting the execution context from the actual cmMakefile where the current target_link_libraries call takes place. Test this by verifying that such calls correctly produce an error diagnostic instead of crashing.
* | | | Merge branch 'doc-find-path-variables' into releaseBrad King2015-06-2514-97/+88
|\ \ \ \
| * | | | Help: Revise CMAKE_*_PATH and CMAKE_SYSTEM_*_PATH variable docs (#15631)Brad King2015-06-2514-97/+88
| |/ / / | | | | | | | | | | | | | | | | Improve reStructuredText formatting and cross-references. Specify explicitly that each variable may be set to a ;-list of multiple values.
* | | | Merge branch 'doc-CheckIncludeFile-distinction' into releaseBrad King2015-06-253-48/+56
|\ \ \ \
| * | | | Help: Revise CheckIncludeFile* documentationBrad King2015-06-253-48/+56
| |/ / / | | | | | | | | | | | | | | | | Improve formatting. Link from each module to the other two. Explain the command signatures in more detail.
* | | | Merge branch 'cmake-gui-osx-install-command-line' into releaseBrad King2015-06-242-2/+2
|\ \ \ \
| * | | | cmake-gui: Change --install to use /usr/local/bin by default (#15627)Brad King2015-06-242-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.3.0-rc1~49^2~2 (cmake-gui: Add --install option to add command-line tools on OS X, 2015-05-19) the option default was set to /usr/bin because that is where the old command line install dialog placed the symlinks. A better default is /usr/local/bin because it is meant for locally installed software rather than Apple-installed tools. Also, as of OS X El Capitan, special privileges are required even for root to modify /usr/bin but not /usr/local/bin.
* | | | | Merge branch 'fix-function-missing-end' into releaseBrad King2015-06-2213-27/+52
|\ \ \ \ \
| * | | | | Fix assertion failure on unmatched function or macroBrad King2015-06-2213-27/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fix in commit v3.2.3~3^2 (Fix assertion failure on unmatched foreach in function, 2015-05-18) broke handling of unmatched non-loop blocks because it assumed all function blockers removed during error unwinding were for loops, essentially switching the set of mishandled cases. The purpose of the loop block push/pop operations is to define a scope matching the lifetime of the loop function blockers. Since our function blockers already have the proper lifetime, simply move the push/pop operations to their constructor/destructor. Extend the RunCMake.Syntax test with a case covering this.
* | | | | | Merge branch 'doc-cmake-buildsystem-typo' into releaseBrad King2015-06-221-1/+1
|\ \ \ \ \ \
| * | | | | | Help: Fix a typo in cmake-buildsystem(7) manualErik Sjölund2015-06-221-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Add the property name INTERFACE_INCLUDE_DIRECTORIES that was missing from a set_property command.
* | | | | | Merge branch 'doc-CMAKE_GENERATOR_PLATFORM-typo' into releaseBrad King2015-06-181-1/+1
|\ \ \ \ \ \
| * | | | | | Help: Fix typo in CMAKE_GENERATOR_PLATFORM docs (#15621)Brad King2015-06-181-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | s/toolset/platform/
* | | | | | CMake 3.3.0-rc2v3.3.0-rc2Brad King2015-06-091-1/+1
| | | | | |
* | | | | | Merge branch 'doc-policy-OLD-deprecated' into releaseBrad King2015-06-0967-5/+139
|\ \ \ \ \ \
| * | | | | | Help: Document explicitly that policy OLD behavior is deprecatedBrad King2015-06-0967-5/+139
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most likely documentation page a project author will read in response to a policy warning is the page for the policy itself. Add to every policy documentation page a note explicitly stating that the OLD behavior is deprecated. Also mention this in the cmake_policy() command documentation that explains how to set a policy to OLD. Suggested-by: Fraser Hutchison <fraser.hutchison@gmail.com>
* | | | | | Merge branch 'doc-drop-incorrect-cmake-developer-advice' into releaseBrad King2015-06-081-1/+0
|\ \ \ \ \ \