summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* CMake 3.5.0-rc2v3.5.0-rc2Brad King2016-02-101-1/+1
|
* Merge branch 'curl-pre-7.21.5' into releaseBrad King2016-02-091-0/+5
|\
| * cmCurl: Fix compilation with system curl versions prior to 7.21.5Brad King2016-02-091-0/+5
| | | | | | | | | | | | | | This version introduced CURLE_NOT_BUILT_IN which we have used since commit v3.4.0-rc1~211^2~4 (cmCurl: Tolerate lack of CURLOPT_CAPATH support, 2015-08-12). For older versions, just define the name to the then-unused error code so that we can compile.
* | Merge branch 'wix-prevent-nsis-overwrite' into releaseBrad King2016-02-0910-4/+151
|\ \
| * | CMake: Prevent WiX installations over existing NSIS installationsNils Gladitz2016-02-0910-4/+151
| |/ | | | | | | | | | | | | | | Use a custom action to look for Uninstall.exe in the user selected installation prefix. Its presence indicates a previous NSIS installation. Inform the user and request manual resolution of the issue.
* | Merge branch 'fix-target-lookup-performance-regression' into releaseBrad King2016-02-084-62/+47
|\ \
| * | Improve internal generator target structure lookupBrad King2016-02-083-35/+22
| | | | | | | | | | | | | | | | | | | | | | | | In commit v3.5.0-rc1~272^2~6 (cmGlobalGenerator: Add FindGeneratorTarget API, 2015-10-25) a lookup was implemented via linear search. Replace it with an efficient data structure. Suggested-by: Stephen Kelly <steveire@gmail.com>
| * | Fix internal target lookup performance regressionBrad King2016-02-083-34/+32
| |/ | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.5.0-rc1~272^2~13 (cmGlobalGenerator: Remove direct storage of targets, 2015-10-25) replaced an efficient data structure mapping from target name to cmTarget instance with a linear search. Lookups through cmGlobalGenerator::FindTarget are done a lot. Restore the efficient mapping structure with a name indicating its purpose. Reported-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
* | Merge branch 'fix-install-EXPORT-crash' into releaseBrad King2016-02-088-6/+19
|\ \
| * | Tests: Avoid OS X 10.5 limitation warning in RunCMake.install testBrad King2016-02-081-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The EXPORT-OldIFace test case uses install(TARGETS) and so generates a warning: CMake Warning in CMakeLists.txt: WARNING: Target "foo" has runtime paths which cannot be changed during install. To change runtime paths, OS X version 10.6 or newer is required. Therefore, runtime paths will not be changed when installing. CMAKE_BUILD_WITH_INSTALL_RPATH may be used to work around this limitation. Set CMAKE_BUILD_WITH_INSTALL_RPATH to avoid the warning since we do not need to run the binaries from the build tree anyway.
| * | install(EXPORT): Fix crash on target in another directoryBrad King2016-02-054-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring merged by commit v3.5.0-rc1~299 (Merge topic 'use-generator-target', 2015-10-20) in and around commit v3.5.0-rc1~299^2~13 (cmExportSet: Store a cmGeneratorTarget, 2015-10-17) changed export sets to delay looking up actual targets and stores only their names. However, in InstallCommand::HandleExportMode we need to lookup targets immediately to check them for EXPORT_LINK_INTERFACE_LIBRARIES. The check was accidentally made local to the current directory, so if an export set contains a target from another directory the lookup fails and CMake crashes. Fix the check to look up the target name globally, and tolerate when no target is found just in case. Reported-by: Kelly Thompson <kgt@lanl.gov>
| * | Tests: Use newer policy settings in RunCMake.install testBrad King2016-02-054-3/+4
| |/ | | | | | | In particular, avoid CMP0042 warnings on OS X.
* | Merge branch 'test-ctest_submit-update' into releaseBrad King2016-02-084-4/+4
|\ \
| * | Tests: Extend ctest_submit host lookup failure matching (#15958)Orion Poplawski2016-02-084-4/+4
| |/ | | | | | | | | | | | | Match this message: Could not resolve host: -no-site-; Name or service not known ^^^^^^^^^^^^^^^^^^^^^^^^^^^
* | Merge branch 'install-man-conditionally' into releaseBrad King2016-02-081-0/+8
|\ \
| * | Install ccmake.1 and cmake-gui.1 conditionally with their tools (#15957)Brad King2016-02-081-0/+8
| |/
* | Merge branch 'fix-doc-typos' into releaseBrad King2016-02-082-2/+2
|\ \
| * | Help: Fix command specification for cmake_minimum_requiredHorst Kronstorfer2016-02-081-1/+1
| | | | | | | | | | | | | | | | | | Implementation indicates that at least two components of VERSION must be specified (see Source/cmCMakeMinimumRequired.cxx.) Therefore the minor version is not optional.
| * | Help: Fix mistake in cmake-buildsystem(7) examplePaul Wilkinson2016-02-081-1/+1
| |/ | | | | | | | | | | The COMPATIBLE_INTERFACE_NUMBER_MAX example now sets INTERFACE_CONTAINER_SIZE_REQUIRED on lib1Version2 and lib1Version3. Previously set it on lib1Version2 twice and never on lib1Version3.
* | Merge branch 'ExternalProject-build-config-compat' into releaseBrad King2016-02-081-2/+17
|\ \
| * | ExternalProject: Be compatible with projects setting CMAKE_CFG_INTDIRBrad King2016-02-051-2/+17
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.5.0-rc1~32^2~1 (ExternalProject: Simplify `cmake --build` configuration passing, 2016-01-19) we use the `$<CONFIG>` generator expression to generate the `cmake --build . --config <config>` value for the default BUILD_COMMAND instead of the CMAKE_CFG_INTDIR placeholder value provided by multi-config generators. However, some projects have been abusing the old implementation detail by setting CMAKE_CFG_INTDIR themselves to get a specific configuration. Those projects should be updated to set their own BUILD_COMMAND to get non-default behavior. Meanwhile we can be compatible with their existing releases by detecting when CMAKE_CFG_INTDIR is not a generator-provided placeholder and using its value instead.
* | Merge branch 'fix-Fortran-module-in-subdir' into releaseBrad King2016-02-086-5/+9
|\ \
| * | Fix dependency scanning configuration in subdirectoriesBrad King2016-02-056-5/+9
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit v3.5.0-rc1~347^2~2 (Set the current dirs on the snapshot before creating the cmMakefile) accidentally changed the source and binary directories configured in `cmake -E cmake_depends` for use during dependency scanning. This can cause the wrong directory information to be loaded. It also breaks Fortran module dependency scanning for modules provided by targets in subdirectories that do not have Fortran_MODULE_DIRECTORY set. Fix the dependency scanning directory configuration and add a test to cover the Fortran module case in which the breakage was observed. Reported-by: Kelly Thompson <kgt@lanl.gov>
* | CMake 3.5.0-rc1 version updatev3.5.0-rc1Brad King2016-02-022-4/+4
| |
* | Help: Drop development topic notes to prepare releaseBrad King2016-02-022-9/+0
|/ | | | | Release versions do not have the development topic section of the CMake Release Notes index page.
* Merge topic 'doc-3.5-relnotes'Brad King2016-02-0235-211/+183
|\ | | | | | | | | | | ad701d9f Help: Organize and revise 3.5 release notes 377a12b2 Help: Consolidate 3.5 release notes
| * Help: Organize and revise 3.5 release notesBrad King2016-02-011-77/+106
| | | | | | | | | | Add section headers similar to the 3.4 release notes and move each individual bullet into an appropriate section. Revise a few bullets.
| * Help: Consolidate 3.5 release notesBrad King2016-02-0135-211/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move all development release notes into a new version-specific document: tail -q -n +3 Help/release/dev/* > Help/release/3.5.rst git rm -- Help/release/dev/* except the sample topic: git checkout HEAD -- Help/release/dev/0-sample-topic.rst Reference the new document from the release notes index document. Add a title and intro sentence to the new document by hand.
* | Merge topic 'remove-stray-semicolon'Brad King2016-02-021-1/+1
|\ \ | | | | | | | | | | | | ccb2d5c0 cmAlgorithms.h: remove superfluous semicolon after method
| * | cmAlgorithms.h: remove superfluous semicolon after methodChristoph GrĂ¼ninger2016-02-011-1/+1
| |/
* | Merge topic 'fix-CMAKE_MATCH-self-match'Brad King2016-02-023-0/+16
|\ \ | | | | | | | | | | | | 6ffc4323 cmConditionEvaluator: Fix matching of `CMAKE_MATCH_*` values (#15944)
| * | cmConditionEvaluator: Fix matching of `CMAKE_MATCH_*` values (#15944)Brad King2016-02-013-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While evaluating `if(MATCHES)` we get a `const char*` pointer to the string to be matched. On code like if(CMAKE_MATCH_COUNT MATCHES "Y") the string to be matched may be owned by our own result variables. We must move the value to our own buffer before clearing them. Otherwise we risk reading freed storage.
* | | CMake Nightly Date StampKitware Robot2016-02-021-1/+1
| |/ |/|
* | Merge topic 'doc-cmake-developer-typo'Brad King2016-02-011-1/+1
|\ \ | | | | | | | | | | | | 6f83db1c Help: Fix typo in `cmake-developer(7)` manual
| * | Help: Fix typo in `cmake-developer(7)` manualPrayag Verma2016-02-011-1/+1
| | | | | | | | | | | | Fix spelling mistake `sytem` => `system`.
* | | Merge topic 'FindGit-updates'Brad King2016-02-011-13/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | fa78ee97 FindGit: Improve documentation formatting facfb52c FindGit: Document Git_FOUND, unset internal var
| * | | FindGit: Improve documentation formattingBrad King2016-01-271-8/+7
| | | |
| * | | FindGit: Document Git_FOUND, unset internal varChristoph GrĂ¼ninger2016-01-271-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | * Git is called Git, not git. * FindGit sets Git_FOUND, too. * Unset internal variable git_names
* | | | Merge topic 'clarify-add_custom_command-TARGET-scope'Brad King2016-02-0115-18/+59
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d257d681 add_custom_command: Clarify error when TARGET is out of scope (#15681) 4d53e0a7 Help: Clarify `add_custom_command(TARGET)` scope (#15681) 8c615af4 Help: Clarify policy `CMP0040` documentation (#15681) 63c5808f Help: Clarify scope of `if(TARGET)` expression a336e438 Help: Improve markup in `if` command documentation 88968265 Help: Improve markup in `get_target_property` documentation
| * | | | add_custom_command: Clarify error when TARGET is out of scope (#15681)Brad King2016-01-2811-3/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The add_custom_command(TARGET) signature only works for targets defined in the current directory. Clarify this in the error message when the target exists but was defined elsewhere. Inspired-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
| * | | | Help: Clarify `add_custom_command(TARGET)` scope (#15681)Bartosz Kosiorek2016-01-281-2/+5
| | | | |
| * | | | Help: Clarify policy `CMP0040` documentation (#15681)Bartosz Kosiorek2016-01-281-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | State explicitly that the target must be defined in the current directory. While at it, improve markup formatting.
| * | | | Help: Clarify scope of `if(TARGET)` expressionBartosz Kosiorek2016-01-281-3/+4
| | | | |
| * | | | Help: Improve markup in `if` command documentationBartosz Kosiorek2016-01-281-1/+1
| | | | |
| * | | | Help: Improve markup in `get_target_property` documentationBartosz Kosiorek2016-01-281-1/+1
| | |_|/ | |/| |
* | | | CMake Nightly Date StampKitware Robot2016-02-011-1/+1
| |_|/ |/| |
* | | CMake Nightly Date StampKitware Robot2016-01-311-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-01-301-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-01-291-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-01-281-1/+1
|/ /