summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Refactor internal resource location APIs and initializationBrad King2013-11-1226-350/+212
| | | | | | | | | | | | | | | | | | | | Rename cmSystemTools::FindExecutableDirectory to FindCMakeResources. Teach it to compute the locations of cmake, ctest, cpack, ccmake, and cmake-gui executables, and the location of CMAKE_ROOT. Provide this information from static cmSystemTools::Get<resource>() methods. Refactor code that needs these locations to use the new APIs. Teach FindCMakeResources to use the OS X system API to lookup the executable location. When running from the CMake build tree itself, leave a file in the tree that FindCMakeResources can use to read the location of the source tree. This avoids the need to compile the source tree location into a binary that may be installed and used without the source tree. Teach the QtDialog on OS X to create a "cmake-gui" symlink in the build tree next to "cmake" and the other tools, as is already done in the install tree for the application bundle. This ensures a consistent set of executables are available in one directory.
* Merge topic 'cfbundle-test-no-cl-tools'Brad King2013-11-071-1/+7
|\ | | | | | | | | a5aadcd CFBundle test: Add isysroot argument when calling Rez.
| * CFBundle test: Add isysroot argument when calling Rez.Clinton Stimpson2013-11-061-1/+7
| |
* | CMake Nightly Date StampKitware Robot2013-11-071-1/+1
| |
* | Merge branch 'release'Brad King2013-11-061-0/+26
|\ \
| * | CMake 2.8.12.1v2.8.12.1Brad King2013-11-052-1/+27
| | |
| * | Merge branch 'fix-automoc-compile-definitions' into releaseBrad King2013-11-053-5/+25
| |\ \
| * \ \ Merge branch 'cmake-E-automoc-crash' into releaseBrad King2013-11-051-1/+1
| |\ \ \
| * \ \ \ Merge branch 'clear-evaluation-files' into releaseBrad King2013-11-041-0/+8
| |\ \ \ \
| * \ \ \ \ Merge branch 'policy-CMP0022-fixes' into releaseBrad King2013-11-0426-126/+293
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'object-library-no-TARGET_FILE' into releaseBrad King2013-11-026-1/+36
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'object-library-missing-source' into releaseBrad King2013-11-025-0/+13
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'vs12-parallel-cl-FS' into releaseBrad King2013-11-023-1/+7
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'FindCUDA-NPP-5.5' into releaseBrad King2013-11-021-1/+16
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ Merge topic 'doc-html-page-layout'Brad King2013-11-065-4/+22
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a023a26 Help: Configure html favicon fb33219 Help: Configure html page navigation bars e1f8196 Help: Configure |version| replacement correctly edc7cc9 Help: Configure copyright year automatically
| * | | | | | | | | | | Help: Configure html faviconBrad King2013-11-052-0/+1
| | | | | | | | | | | |
| * | | | | | | | | | | Help: Configure html page navigation barsBrad King2013-11-053-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a small CMake logo to the left side of the header and footer navigation bars. Set the html theme, title, and short title explicitly.
| * | | | | | | | | | | Help: Configure |version| replacement correctlyBrad King2013-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix our configuration of the Sphinx conf.py 'version' entry to refer to the correctly-spelled CMake_VERSION_(MAJOR|MINOR|PATCH) variables.
| * | | | | | | | | | | Help: Configure copyright year automaticallyBrad King2013-11-042-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach our Sphinx conf.py to compute the copyright end year automatically. Drop our hard-coded configuration for it.
* | | | | | | | | | | | Merge topic 'refactor-autogen-setup'Brad King2013-11-064-89/+114
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 944277d cmAutogen: Gather tool arguments after creating generator targets. d2f4b1e cmAutogen: Rename method to InitializeAutogenTarget 45735f3 cmAutogen: Move autogen target creation to InitializeMocSourceFile. 20a234d cmAutogen: Extract some helper methods for autogen targets.
| * | | | | | | | | | | | cmAutogen: Gather tool arguments after creating generator targets.Stephen Kelly2013-11-052-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change causes the GetLinkInterfaceDependentStringProperty method, called in SetupAutoGenerateTarget, after the creation of generator targets. In CMake 4.0, the GetLinkInterfaceDependentStringProperty will move to the cmGeneratorTarget class, and this patch is a necessary prerequisite to that.
| * | | | | | | | | | | | cmAutogen: Rename method to InitializeAutogenTargetStephen Kelly2013-11-053-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reflects better what it is doing.
| * | | | | | | | | | | | cmAutogen: Move autogen target creation to InitializeMocSourceFile.Stephen Kelly2013-11-051-67/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The SetupAutoGenerateTarget method will soon be invoked at a later time in a followup commit. We need to ensure that we create the utility autogen target early.
| * | | | | | | | | | | | cmAutogen: Extract some helper methods for autogen targets.Stephen Kelly2013-11-051-9/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These snippets will soon be needed from multiple methods.
* | | | | | | | | | | | | Merge topic 'clear-generator-data'Brad King2013-11-062-48/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5cf1120 cmGlobalGenerator: Refactor member cleanup between configures
| * | | | | | | | | | | | cmGlobalGenerator: Refactor member cleanup between configuresBrad King2013-11-052-48/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Factor member cleanup out from cmGlobalGenerator::Configure and the destructor into a dedicated helper to avoid duplication. This fixes clearing of BuildExportSets between configures.
* | | | | | | | | | | | | CMake Nightly Date StampKitware Robot2013-11-061-1/+1
| |/ / / / / / / / / / / |/| | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'fix-automoc-compile-definitions'Brad King2013-11-053-5/+25
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a1b9465 Automoc: Add directory-level COMPILE_DEFINITIONS to command line (#14535)
| * | | | | | | | | | | Automoc: Add directory-level COMPILE_DEFINITIONS to command line (#14535)Stephen Kelly2013-11-053-5/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 18412153 (Refactor cmTarget::GetCompileDefinitions..., 2013-06-06) cmQtAutomoc was refactored to get all compile definitions from the target instead of separately asking the target and querying the directory-level COMPILE_DEFINITIONS property value. While the generation process does integrate directory-level COMPILE_DEFINITIONS into the target definitions, this did not happen until after Automoc targets are constructed. Therefore the commit regressed use of directory-level definitions in Automoc targets. Factor the definition finalization logic out from the cmGlobalGenerator::CreateGeneratorTargets method into a new cmGlobalGenerator::FinalizeTargetCompileDefinitions method and call it before constructing Automoc targets. This will place the directory-level definitions into the target in time to use them for the Automoc targets. Extend the QtAutomoc test to cover this case.
* | | | | | | | | | | | Merge topic 'osx-no-PackageMaker'Brad King2013-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7947981 CPack: Disable OS X PackageMaker by default (#13662)
| * | | | | | | | | | | | CPack: Disable OS X PackageMaker by default (#13662)Brad King2013-11-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As mentioned in commit 4693cf84 (Xcode: Detect new default locations of Xcode 4.3 bits and pieces) PackageMaker was split out of Xcode 4.3 and above into a separate Auxiliary tools package. Since Xcode 5.0 or so, Apple no longer distributes PackageMaker as part of the available development tools so it can only be obtained from old packages. Disable the CPACK_BINARY_PACKAGEMAKER option by default as is the case for most other tool-dependent generators.
* | | | | | | | | | | | | Merge topic 'test-Assembler-no-g'Brad King2013-11-051-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f60797f Tests/Assembler: Drop -g when generating sample assembly source
| * | | | | | | | | | | | | Tests/Assembler: Drop -g when generating sample assembly sourceBrad King2013-11-011-0/+3
| |/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some compilers, such as Clang on OS X, do not want the -g flag for both generating assembly code and assembling it. Drop the -g flag from generation of main.s in the Assembler test.
* | | | | | | | | | | | | Merge topic 'cmake-E-autogen-crash'Brad King2013-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 132c40a cmake: Validate -E cmake_autogen argument count (#14545) cc52b7d Merge branch 'cmake-E-automoc-crash' into cmake-E-autogen-crash 9ef66f2 cmake: Validate -E cmake_automoc argument count (#14545)
| * | | | | | | | | | | | | cmake: Validate -E cmake_autogen argument count (#14545)Brad King2013-11-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not access an argument index not known to exist. Port the change from commit 9ef66f2b (cmake: Validate -E cmake_automoc argument count, 2013-11-05) to the new location of the code.
| * | | | | | | | | | | | | Merge branch 'cmake-E-automoc-crash' into cmake-E-autogen-crashBrad King2013-11-050-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | / | | | |_|_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |
| | * | | | | | | | | | | cmake: Validate -E cmake_automoc argument count (#14545)Brad King2013-11-051-1/+1
| | | |/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not access an argument index not known to exist.
* | | | | | | | | | | | Merge topic 'remove-cmake-i-wizard'Brad King2013-11-052-3/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0fa9aea Help: Drop mention of cmake -i wizard mode
| * | | | | | | | | | | | Help: Drop mention of cmake -i wizard modeBrad King2013-11-042-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit removed support for this mode, so do not mention it in the documentation.
* | | | | | | | | | | | | Merge topic 'doc-tool-usage'Brad King2013-11-055-14/+28
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1e8a02 Help: Refine manual/*.1.rst usage summaries
| * | | | | | | | | | | | | Help: Refine manual/*.1.rst usage summariesBrad King2013-11-045-14/+28
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a parsed-literal block to list possible command-line signatures. Add an "Options" section header before the list of options.
* | | | | | | | | | | | | Merge topic 'FindPHP4-no-cache-output'Brad King2013-11-051-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a06debc FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)
| * | | | | | | | | | | | | FindPHP4: Drop extra content from reported PHP4_INCLUDE_PATH (#14540)Brad King2013-11-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The set() call for this variable left out the CACHE keyword. It does not need to be cached anyway, so drop the other CACHE set() signature arguments. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722475 Reported-by: Modestas Vainius <modax@debian.org> Inspired-by: Mathieu Malaterre <malat@debian.org>
* | | | | | | | | | | | | | Merge topic 'FindJNI-biarch'Brad King2013-11-051-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cde56c1 FindJNI: Support biarch installations (#14541)
| * | | | | | | | | | | | | | FindJNI: Support biarch installations (#14541)Modestas Vainius2013-11-041-2/+2
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On biarch architecture, CMAKE_SYSTEM_PROCESSOR might be a 64bit one while the system 32bit one. Take this into consideration while looking for Java library directory. Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=718290
* | | | | | | | | | | | | | Merge topic 'ninja-dont-parse-empty-depsflag'Brad King2013-11-051-5/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f212615 Ninja: don't parse empty string
| * | | | | | | | | | | | | | Ninja: don't parse empty stringPeter Kümmel2013-11-041-5/+8
| | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge topic 'ninja-deps-intel'Brad King2013-11-052-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d439083 Ninja: add depfile support for Intel's compiler
| * | | | | | | | | | | | | | Ninja: add depfile support for Intel's compilerPeter Kümmel2013-11-042-0/+4
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge topic 'clear-evaluation-files'Brad King2013-11-051-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2e388cc file(GENERATE): Clear internal records between configures
generated by cgit v0.12 at 2025-01-31 12:19:46 (GMT)