summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'list-empty-error' into enhance-include_external_msprojectBrad King2012-04-1913-1/+44
|\ | | | | | | Resolve conflict in Tests/RunCMake/CMakeLists.txt by adding both tests.
| * list: Handle errors on empty lists more gracefully (#13138)Brad King2012-04-1713-1/+44
| | | | | | | | | | | | | | | | | | | | | | | | Since commit ed1ea24c (Fix INSERT to allow inserting to empty list, 2006-05-15) the list command allows insertion into an empty list at index 0. Fix rejection of insertion at non-zero (negative) indices to present an error message instead of crashing. While at it, fix the error message of the GET and REMOVE_AT operations when the list is empty to not present a bogus allowed range. Add a "RunCMake.list" test to cover failure cases on empty lists.
* | include_external_msproject: Test TYPE, GUID, PLATFORM options (#13120)Brad King2012-04-1911-0/+138
| | | | | | | | | | | | | | | | | | Add "RunCMake.include_external_msproject" test to use the TYPE, GUID, and PLATFORM options to include_external_msproject. Since projects with custom types and platforms cannot be loaded without special VS plugins validate the results by directly parsing the generated solution (.sln). Co-Author: Leonid Yurchenko <nocturne@qarea.com>
* | Merge branch 'test-RunCMake-check' into enhance-include_external_msprojectBrad King2012-04-192-9/+19
|\ \
| * | Teach RunCMake tests to allow custom checksBrad King2012-04-192-9/+19
| | | | | | | | | | | | | | | | | | Look for a <SubTest>-check.cmake script and load it to check side effects of the sub test. Provide it with the test source and build tree paths in variables. Check for a failure message in a result variable.
* | | include_external_msproject: Add TYPE, GUID, PLATFORM options (#13120)Leonid Yurchenko2012-04-169-25/+122
|/ / | | | | | | These allow one to reference more external VS project file variations.
* | KWSys Nightly Date StampKWSys Robot2012-04-161-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-04-151-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-04-141-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-04-131-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-04-121-1/+1
| |
* | KWSys Nightly Date StampKWSys Robot2012-04-111-1/+1
| |
* | Merge topic 'check_include_files_output'David Cole2012-04-101-4/+14
|\ \ | | | | | | | | | | | | 5adb6b7 CheckIncludeFiles: Shorten check description message
| * | CheckIncludeFiles: Shorten check description messageBrad King2012-04-091-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 44d007b6 (CheckIncludeFiles: fix status output, 2012-02-01) check_include_files reports the list of files tested instead of the name of the variable storing the result. Some projects incrementally test and concatenate very long lists leading to long messages that do not provide much information. Users report confusion especially when the lines wrap. For lists of more than two files produce messages of the format Looing for N include files first.h, ..., last.h where N is the list length and "..." is literal. Leave the log file entries and cache entry description unchanged as they should have the full detail of the check performed.
* | | Merge topic 'new-boost-versions'David Cole2012-04-101-2/+3
|\ \ \ | | | | | | | | | | | | | | | | 63d4960 FindBoost: add support for 1.49 and 1.50
| * | | FindBoost: add support for 1.49 and 1.50Rolf Eike Beer2012-04-071-2/+3
| | | | | | | | | | | | | | | | | | | | Boost 1.49 has already be released. Add this and the next to come version number to the search list.
* | | | Merge topic 'osx-search-paths'David Cole2012-04-101-3/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6190415 OS X: Mark find_program results as advanced d9edf46 OS X: Use correct extra path when searching for applicaton bundles (#13066) 98b9a7f OS X: Use OSX_DEVELOPER_ROOT for app search path (#13066)
| * | | | OS X: Mark find_program results as advancedDavid Cole2012-04-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Avoid cluttering the gui with variables nearly nobody needs to see.
| * | | | OS X: Use correct extra path when searching for applicaton bundles (#13066)David Cole2012-04-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit added a search path relative to OSX_DEVELOPER_ROOT. But with Xcode 4.3 the nested Applications folder is in a different relative location compared to that root. This commit makes the intent of the previous commit work with older and newer Xcode directory layouts. Furthermore, it only adds paths that exist to the search path.
| * | | | OS X: Use OSX_DEVELOPER_ROOT for app search path (#13066)Kashif Rasul2012-03-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 4693cf84 (Xcode: Detect new default locations of Xcode 4.3 bits and pieces) Darwin.cmake detects the developer application directory instead of hard-coding /Developer. Replace the hard-coded path in CMAKE_SYSTEM_APPBUNDLE_PATH using the computed result.
* | | | | Merge topic 'CPackNSIS-smallDocTypoFix'David Cole2012-04-101-3/+10
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fcf265f CPackNSIS: Rewrite variable documentation to make it more readable. 8fe0da5 Fix some doc typo and add an undocumented var.
| * | | | | CPackNSIS: Rewrite variable documentation to make it more readable.David Cole2012-04-051-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | And avoid parsing problems at the first "."
| * | | | | Fix some doc typo and add an undocumented var.Eric NOULARD2012-03-271-3/+8
| |/ / / /
* | | | | KWSys Nightly Date StampKWSys Robot2012-04-101-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2012-04-091-1/+1
| | | | |
* | | | | KWSys Nightly Date StampKWSys Robot2012-04-081-1/+1
| |/ / / |/| | |
* | | | KWSys Nightly Date StampKWSys Robot2012-04-071-1/+1
| | | |
* | | | KWSys Nightly Date StampKWSys Robot2012-04-061-1/+1
| |_|/ |/| |
* | | KWSys Nightly Date StampKWSys Robot2012-04-051-1/+1
| | |
* | | KWSys Nightly Date StampKWSys Robot2012-04-041-1/+1
| | |
* | | Merge topic 'fix-13082-use-config-0'David Cole2012-04-031-1/+6
|\ \ \ | | | | | | | | | | | | | | | | 0579fa0 Xcode: Pay attention to custom configuration types (#13082)
| * | | Xcode: Pay attention to custom configuration types (#13082)David Cole2012-04-021-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we were setting the default configuration for a generated Xcode project to the hard-coded string "Debug" even in cases where users customized their configuration types such that the list did not contain "Debug". Now, we use the first string listed in CMAKE_CONFIGURATION_TYPES as the default config for generated Xcode projects.
* | | | Merge topic 'ninja-generated-def'David Cole2012-04-032-4/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 3fd0dde Merge branch 'test-generated-def' into ninja-generated-def d2c764a Ninja: Fix module .def file path conversion
| * \ \ \ Merge branch 'test-generated-def' into ninja-generated-defBrad King2012-04-024-1/+14
| |\ \ \ \
| * | | | | Ninja: Fix module .def file path conversionBrad King2012-04-022-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactoring in commit a2514f15 (Simplify cmNinjaTargetGenerator using cmGeneratorTarget, 2012-03-13) accidentally removed mapping of .def file paths through ConvertToNinjaPath (via GetSourceFilePath). Take the ModuleDefinitionFile value from cmGeneratorTarget and map it correctly through ConvertToNinjaPath. In addition to generating cleaner paths in the ninja build files this correctly links up references to a generated .def file with the custom command output that produces it.
* | | | | | Merge topic 'test-generated-def'David Cole2012-04-034-1/+14
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | 89987c2 Test generated module .def files
| * | | | | Test generated module .def filesBrad King2012-04-024-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach the ModuleDefinition test to cover the case that a .def file is generated by a custom command.
* | | | | | Merge topic 'clarify-suffix-docs'David Cole2012-04-031-2/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa08375 CMake: Clarify SUFFIX target property documentation.
| * | | | | | CMake: Clarify SUFFIX target property documentation.David Cole2012-04-021-2/+3
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | Make it clear that the property applies to libs, modules and exes, not just libs.
* | | | | | Merge topic 'OBJECTLibrariesInEclipse'David Cole2012-04-031-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | f93d03d fix #13054: support OBJECT libraries in Eclipse
| * | | | | | fix #13054: support OBJECT libraries in EclipseAlex Neundorf2012-03-301-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | | Merge topic 'doc-improvements'David Cole2012-04-032-2/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32c3be6 FIND_LIBRARY: document FIND_LIBRARY_USE_LIB64_PATHS edd8996 FILE: mention that TO_CMAKE_PATH also handles list delimiters
| * | | | | | | FIND_LIBRARY: document FIND_LIBRARY_USE_LIB64_PATHSRolf Eike Beer2012-03-291-1/+7
| | | | | | | |
| * | | | | | | FILE: mention that TO_CMAKE_PATH also handles list delimitersRolf Eike Beer2012-03-291-1/+2
| | |_|_|_|/ / | |/| | | | |
* | | | | | | Merge topic 'dev/granular-test-targets-ninja'David Cole2012-04-031-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d5318e0 Create granular targets for Ninja generators too
| * | | | | | | Create granular targets for Ninja generators tooBen Boeckel2012-03-291-2/+2
| |/ / / / / /
* | | | | | | Merge topic 'include-unistd-on-mac'David Cole2012-04-031-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 8a70495 automoc: include <unistd.h> on Apple to get pathconf
| * | | | | | | automoc: include <unistd.h> on Apple to get pathconfSean McBride2012-03-281-0/+3
| | | | | | | |
* | | | | | | | Merge topic 'fix-source-classification'David Cole2012-04-0310-54/+66
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 01e979a VS: Add CMakeLists.txt re-run rules at start of generation 9a2c60e Classify known header file extensions as headers 1c48992 Always compile sources with known language
| * | | | | | | | VS: Add CMakeLists.txt re-run rules at start of generationBrad King2012-03-287-48/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 328c0f65 (Simplify cmVisualStudio10TargetGenerator source classification, 2012-03-19) the VS 10 generator uses the cmGeneratorTarget source classification instead of directly getting the list of source files from the target. This accidentally dropped the CMakeLists.txt files from generated projects because they are added too late for cmGeneratorTarget. All generator-specific source files must be added to targets prior to cmGeneratorTarget construction. Refactor addition of the CMakeLists.txt files with CMake re-run custom commands to take place before normal generation begins, and therefore early enough to be included in the cmGeneratorTarget classification.