summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \ \ \
| * | | | | Help: Drop incorrect advice from cmake-developer.7 manualBrad King2015-06-081-1/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | Drop the comment on the purpose of PATH_SUFFIXES in our Find Module example. It was incorrect.
* | | | | Merge branch 'revert-mingw-no-find_library-dll' into releaseBrad King2015-06-082-7/+1
|\ \ \ \ \
| * | | | | Windows-GNU: Restore find_library treatment of '.dll' as linkable (#15409)Brad King2015-06-082-7/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commit v3.3.0-rc1~435^2 (Windows-GNU: Do not tell find_library to treat '.dll' as linkable, 2015-02-18). MinGW tools support linking to '.dll' files directly and many non-CMake build systems still do not provide a separate '.dll.a' file.
* | | | | | Merge branch 'ctest-script-mode-no-legacy-cygwin' into releaseBrad King2015-06-081-0/+4
|\ \ \ \ \ \
| * | | | | | ctest: Disable CMake Cygwin legacy warning in dashboard client scriptBrad King2015-06-081-0/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ctest -S mode we load the CTestScriptMode module to give the configuration scripts access to the host system information. CYGWIN.cmake warns unless we explicitly tell it not to warn since there is no chance for a cmake_minimum_required(VERSION) to be called.
* | | | | | Merge branch 'cmake-gui-osx-install-command-line' into releaseBrad King2015-06-081-0/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | cmake-gui: Make command-line install help text selectableClinton Stimpson2015-06-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This will allow users to cut-n-paste the instructions over to a command prompt.
* | | | | | Merge branch 'FindwxWidgets-versioned-executable' into releaseBrad King2015-06-081-1/+2
|\ \ \ \ \ \
| * | | | | | FindwxWidgets: Fix find_program call for versioned namesBrad King2015-06-081-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit v3.3.0-rc1~132^2 (FindwxWidgets: Search for wx-config-3.0 in addition to wx-config, 2015-04-29) we added a second (versioned) name to the find_program call. Specifying multiple names requires use of the NAMES option. Add it now. While at it, also add versioned names for 2.9 and 2.8.
* | | | | | | Merge branch 'doc-add_custom_command-clarify-TARGET_FILE' into releaseBrad King2015-06-081-0/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Help: Reference TARGET_FILE genex in add_custom_command docs (#15605)Brad King2015-06-081-0/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When documenting in the COMMAND option how to reference an executable, we previously only explicitly covered how to do it for argv[0] and left it to the reader to follow the reference to the generator expressions manual. Add explicit mention of the TARGET_FILE genex in this documentation since it will be a commonly used generator expression in this context.
* | | | | | Merge branch 'CPackDeb-dpkg-shlibdeps-check-flag' into releasev3.3.0-rc1Brad King2015-06-031-7/+11
|\ \ \ \ \ \
| * | | | | | CPackDeb: Check dpkg-shlibdeps --ignore-missing-info flagBrad King2015-06-031-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for this flag explicitly in the --help output before using it. It turns out there are some versions of the tool that support --version but not --ignore-missing-info.
| * | | | | | CPackDeb: Check dpkg-shlibdeps version more robustlyBrad King2015-06-031-4/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Use if(MATCHES) to verify that a match exists before using the match group variable.
* | | | | | CMake 3.3.0-rc1 version updateBrad King2015-06-022-4/+4
| | | | | |
* | | | | | Help: Drop development topic notes to prepare releaseBrad King2015-06-022-9/+0
|/ / / / / | | | | | | | | | | | | | | | | | | | | Release versions do not have the development topic section of the CMake Release Notes index page.