summaryrefslogtreecommitdiffstats
path: root/Source
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'xcode-select'David Cole2012-08-131-2/+17
|\ | | | | | | | | e88bae7 Xcode: Run xcode-select to find Xcode version file (#13463)
| * Xcode: Run xcode-select to find Xcode version file (#13463)Brad King2012-08-101-2/+17
| | | | | | | | | | | | | | Multiple versions of Xcode may be installed in different locations. Run "xcode-select --print-path" to detect the active Xcode location and parse its Contents/version.plist file. Note that the Xcode.app directory name may vary in developer versions.
| * CMake Nightly Date StampKitware Robot2012-08-091-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-08-081-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-08-071-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-08-061-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-08-051-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-08-041-1/+1
| |
* | Merge topic 'doc_fixes'David Cole2012-08-131-3/+3
|\ \ | | | | | | | | | | | | 76d6c59 Clean up documentation formatting so that it is rendered properly in HTML.
| * | Clean up documentation formatting so that it is rendered properly in HTML.Zack Galbreath2012-08-031-3/+3
| |/
* | Merge topic 'xcode-object-dir'David Cole2012-08-131-1/+1
|\ \ | | | | | | | | | | | | b237dbd Xcode: Fix object library references in multi-project trees (#13452)
| * | Xcode: Fix object library references in multi-project trees (#13452)Brad King2012-08-031-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In cmGlobalXCodeGenerator::Generate we generate a .xcodeproj for each directory in the tree containing a project() command. First we iteratively use SetGenerationRoot to add "ALL_BUILD" and other targets to each project. This leaves "CurrentProject" set to the last project when we invoke cmGlobalGenerator::Generate, which is not the same as the top-level project if any subdirectories invoke the project() command. When cmGlobalGenerator::Generate reaches CreateGeneratorTargets it constructs cmGeneratorTarget and calls ComputeTargetObjects exactly once per target. In this context the value of CurrentProject is undefined so we cannot pass it to GetObjectsNormalDirectory. Use "$(PROJECT_NAME)" instead so it will adapt automatically to each project. Also teach Tests/ObjectLibrary to cover this case.
| * CMake Nightly Date StampKitware Robot2012-08-031-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-08-021-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-08-011-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-07-311-1/+1
| |
* | Merge topic 'directory-typo'David Cole2012-08-131-2/+2
|\ \ | | | | | | | | | | | | 6c8722f Fix typo direcotry -> directory (and similar) [#13444]
| * | Fix typo direcotry -> directory (and similar) [#13444]Rolf Eike Beer2012-07-301-2/+2
| |/
| * CMake Nightly Date StampKitware Robot2012-07-301-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-07-291-1/+1
| |
* | Merge topic 'EclipseFixBadLinkedResources'David Cole2012-08-131-0/+14
|\ \ | | | | | | | | | | | | 4ea5dc5 Eclipse: fix #13358: don't create bad linked resources
| * | Eclipse: fix #13358: don't create bad linked resourcesAlex Neundorf2012-07-281-0/+14
| |/ | | | | | | | | | | | | Don't create linked resources which point to CMAKE_BINARY_DIR itself or one of its parent dirs. Eclipse complained about that. Alex
| * CMake Nightly Date StampKitware Robot2012-07-281-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-07-271-1/+1
| |
| * CMake Nightly Date StampKitware Robot2012-07-261-1/+1
| |
* | Merge topic 'mixed-lib-to-lib64'David Cole2012-08-132-74/+45
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | af80da3 remove lib64 Unix paths if the respective lib path is also given 733726e find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419) 54add62 find_library: Simplify lib->lib<arch> expansion 6ca2f82 find_library: Refactor lib->lib64 conversion 1fe4b82 find_library: Add test covering lib->lib64 cases
| * | find_library: Fix mixed lib->lib64 (non-)conversion cases (#13419)Brad King2012-07-202-16/+39
| | | | | | | | | | | | | | | | | | | | | | | | When a search path contains multiple "lib/" instances we previously converted all or none. This fails for cases where only some of the multiple instances must be converted. Teach AddArchitecturePaths to generate all combinations that exist. Uncomment these cases in the CMakeOnly.find_library test now that they work.
| * | find_library: Simplify lib->lib<arch> expansionBrad King2012-07-201-17/+9
| | | | | | | | | | | | | | | | | | Simplify cmFindLibraryCommand::AddArchitecturePaths logic to avoid recording a separate 'found' status and populating an entire vector<string> just to throw it away.
| * | find_library: Refactor lib->lib64 conversionBrad King2012-07-202-49/+5
| | | | | | | | | | | | | | | | | | | | | Previously methods AddArchitecturePaths and AddLib64Paths were almost identical. Replace the latter with a call to the former. Fix the AddArchitecturePaths implementation to add trailing slashes to all tested paths.
* | | Merge topic 'use_normal_ouput_with_chdir'David Cole2012-08-131-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 4ddd3b9 Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.
| * | | Use OUTPUT_NORMAL instead of OUTPUT_MERGE for cmake -E chdir.Bill Hoffman2012-07-201-1/+1
| |/ / | | | | | | | | | Using OUTPUT_MERGE can cause the output to be jumbled in some cases.
* | | CMake Nightly Date StampKitware Robot2012-08-131-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2012-08-121-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2012-08-111-1/+1
| | |
* | | CMake Nightly Date StampKitware Robot2012-08-101-1/+1
| | |
* | | Begin post-2.8.9 developmentDavid Cole2012-08-091-2/+2
| | |
* | | CMake 2.8.9v2.8.9David Cole2012-08-091-1/+1
| | |
* | | CMake 2.8.9-rc3David Cole2012-07-251-1/+1
| | |
* | | Merge branch 'release'David Cole2012-07-251-3/+3
|\ \ \ | |_|/ |/| |
| * | CMake 2.8.9-rc2David Cole2012-07-141-1/+1
| | |
| * | Merge branch 'release'David Cole2012-07-141-3/+3
| |\ \
| | * | CMake 2.8.9-rc1David Cole2012-06-221-3/+3
| | | |
* | | | CMake Nightly Date StampKitware Robot2012-07-251-1/+1
| | | |
* | | | Merge topic 'ninja-fix-macosx'David Cole2012-07-2425-422/+797
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1fc8df9 Add missing this->. 7a3ecf5 Fix memory leak in Makefile generator. 9f7dc83 Ninja: also bootstrap ninja files 5d365b2 Ninja: enable ninja support everywhere d569f3e Ninja: void function can't return a value 52160bf Ninja: enable ninja on Mac so all Mac CDash-builds are tested, cleanup later 56aeac6 Ninja: fixes for bcc 7a6bc9e Ninja: remove 'this' from member initializer list 44ba4cf Ninja: remove warnings 7751966 Ninja: remove 'friend' in ninja code c3988ee Re-factor OS X content generator start up. f8e0a51 Re-factor framework directory computation. f36c7b0 Re-factor Mac OS X content directory computation. 5d885db Re-factor bundle content copying rules generation. 3b2a01e Ninja: Use same echo message as makefiles. 7bb56c5 Re-factor CFBundle generation. ...
| * | | | Add missing this->.Nicolas Despres2012-07-221-1/+1
| | | | |
| * | | | Fix memory leak in Makefile generator.Nicolas Despres2012-07-222-3/+11
| | | | | | | | | | | | | | | | | | | | This was introduced by 5d885db416a.
| * | | | Ninja: enable ninja support everywherePeter Kümmel2012-07-204-43/+20
| | | | |
| * | | | Ninja: void function can't return a valuePeter Kümmel2012-07-191-2/+2
| | | | |
| * | | | Ninja: enable ninja on Mac so all Mac CDash-builds are tested, cleanup laterPeter Kümmel2012-07-181-1/+1
| | | | |
| * | | | Ninja: fixes for bccPeter Kümmel2012-07-182-1/+3
| | | | |