summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'curl-pre-7.21.5'Brad King2016-02-101-0/+5
|\ | | | | | | | | 1ea55acf cmCurl: Fix compilation with system curl versions prior to 7.21.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.
* | CMake Nightly Date StampKitware Robot2016-02-101-1/+1
| |
* | Merge topic 'fix-target-lookup-performance-regression'Brad King2016-02-094-62/+47
|\ \ | | | | | | | | | | | | | | | 9b7d5871 Improve internal generator target structure lookup 6cbf6a51 Fix internal target lookup performance regression
| * | 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 topic 'install-EXCLUDE_FROM_ALL'Brad King2016-02-0918-33/+98
|\ \ | | | | | | | | | | | | | | | | | | 586e56d0 Help: Add notes for topic 'install-EXCLUDE_FROM_ALL' d321c196 Tests: Add cases for install() command EXCLUDE_FROM_ALL option 18ce97c4 install: Add EXCLUDE_FROM_ALL option (#14921)
| * | install: Add EXCLUDE_FROM_ALL option (#14921)Nick Lewis2016-02-0418-33/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Let us take an example of a project that has some tests in a component that need to be installed into a dedicated test package. The user expectation is that the result could be achieved by typing the following: make make tests make install DESTDIR=/testpkgs make install-tests However this results in test components in the default installation as well as the testpkg. Add an EXCLUDE_FROM_ALL option to the install() command to tell it that the installation rule should not be included unless its component is explicitly specified for installation.
* | | Merge topic 'fix-install-EXPORT-crash'Brad King2016-02-091-3/+5
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | a1ad098d Tests: Avoid OS X 10.5 limitation warning in RunCMake.install test 47460f3e install(EXPORT): Fix crash on target in another directory e86383e1 Tests: Use newer policy settings in RunCMake.install test
| * | | install(EXPORT): Fix crash on target in another directoryBrad King2016-02-051-3/+5
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | CMake Nightly Date StampKitware Robot2016-02-091-1/+1
| | |
* | | Merge topic 'fix-Fortran-module-in-subdir'Brad King2016-02-081-4/+2
|\ \ \ | | | | | | | | | | | | | | | | c5eb21b6 Fix dependency scanning configuration in subdirectories
| * | | Fix dependency scanning configuration in subdirectoriesBrad King2016-02-051-4/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>
* | | Merge topic 'fix-pedantic-warnings'Brad King2016-02-083-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 58a4a771 Make cmLinkInterface:: and cmGeneratorTarget::Multiplicity unsigned ints
| * | | Make cmLinkInterface:: and cmGeneratorTarget::Multiplicity unsigned intsChristoph GrĂ¼ninger2016-02-043-3/+3
| |/ /
* | | Merge topic 'error-multiple-targets'Brad King2016-02-081-1/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | 497cad7c cmake: Teach --build to reject multiple --target options 886acd80 Help: Fix reference to `cmake --build` in cmake(1) manual
| * | | cmake: Teach --build to reject multiple --target optionsSebastian Schuberth2016-02-051-1/+13
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | Previously we did not clearly document that `--target` is only supported to be specified once. Even worse, specifying it multiple times would silently ignore any previously specified targets and only build the last target. Update the documentation to specify this. Update the implementation to reject multiple `--target` options to prevent user errors.
* | | CMake Nightly Date StampKitware Robot2016-02-081-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-02-071-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-02-061-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2016-02-051-1/+1
| | |
* | | Merge topic 'list-FILTER-command'Brad King2016-02-042-0/+115
|\ \ \ | |/ / |/| | | | | | | | 0205f882 list: Add FILTER subcommand (#3986)
| * | list: Add FILTER subcommand (#3986)Ashley Whetter2016-02-032-0/+115
| | | | | | | | | | | | Create a `list(FILTER)` command to filter lists by regular expression.
* | | CMake Nightly Date StampKitware Robot2016-02-041-1/+1
|/ /
* | CMake Nightly Date StampKitware Robot2016-02-031-1/+1
| |
* | Begin post-3.5 developmentBrad King2016-02-021-2/+2
| |
* | CMake 3.5.0-rc1 version updatev3.5.0-rc1Brad King2016-02-021-3/+3
|/
* 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-021-0/+10
|\ \ | | | | | | | | | | | | 6ffc4323 cmConditionEvaluator: Fix matching of `CMAKE_MATCH_*` values (#15944)
| * | cmConditionEvaluator: Fix matching of `CMAKE_MATCH_*` values (#15944)Brad King2016-02-011-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'clarify-add_custom_command-TARGET-scope'Brad King2016-02-011-1/+18
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-281-1/+18
| |/ | | | | | | | | | | | | | | 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>
* | 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
|/
* CMake Nightly Date StampKitware Robot2016-01-271-1/+1
|
* CMake Nightly Date StampKitware Robot2016-01-261-1/+1
|
* Merge topic 'vs-win10-sdk'Brad King2016-01-252-5/+6
|\ | | | | | | | | d7e863c1 VS: Do not fail on Windows 10 with VS 2015 if no SDK is available (#15929)
| * VS: Do not fail on Windows 10 with VS 2015 if no SDK is available (#15929)Brad King2016-01-212-5/+6
| | | | | | | | | | | | | | | | | | | | | | Since commit v3.4.0-rc1~5^2~1 (VS: Add support for selecting the Windows 10 SDK, 2015-09-30) the VS 2015 generator requires a Windows 10 SDK to be available when CMAKE_SYSTEM_VERSION specifies Windows 10 (e.g. when building on a Windows 10 host). Howewver, it is possible to install VS 2015 without any Windows 10 SDK. Instead of failing with an error message about the lack of a Windows 10 SDK, simply tolerate this case and use the default Windows 8.1 SDK. Since building for Windows Store still requires the SDK, retain the diagnostic in that case.
* | CMake Nightly Date StampKitware Robot2016-01-251-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-01-241-1/+1
| |
* | CMake Nightly Date StampKitware Robot2016-01-231-1/+1
| |
* | Merge topic 'fix-use-generator-target'Brad King2016-01-221-1/+1
|\ \ | | | | | | | | | | | | 7dbfdddf cmExportInstallFileGenerator: Fix crash in FindNamespaces
| * | cmExportInstallFileGenerator: Fix crash in FindNamespacesAndrey Pokrovskiy2016-01-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring merged by commit 9afbb733ec (Merge topic 'use-generator-target', 2015-10-20) in and around commit 381e7afd (cmExportSet: Store a cmGeneratorTarget, 2015-10-17) forgot to update one place in this method. This leads to a crash in code such as add_library(A a.c) add_library(B b.c) target_link_libraries(B A) install(TARGETS B DESTINATION lib EXPORT ExpB) install(EXPORT ExpB DESTINATION lib/cmake/test) add_executable(C c.c) install(TARGETS C DESTINATION bin EXPORT ExpC) Fix the target name reference to avoid using an unpopulated Target pointer.
* | | CMake Nightly Date StampKitware Robot2016-01-221-1/+1
| | |
* | | Merge topic 'reduce-allocations'Brad King2016-01-216-29/+26
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70788e92 Remove temporary allocations when calling cmHasLiteral{Suf,Pre}fix. bd2384f5 Optimize cmMakefile::ExpandVariablesInStringNew. ad9394f4 Remove temporary allocations in cmMacroHelper::InvokeInitialPass. f9599ed4 Remove temporary allocations by extending the lifetime of the retval. 275f2a85 Remove temporary allocations when calling cmGeneratorTarget::GetName.