summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cross-compiling-toolchain-variables'Brad King2013-11-2221-9/+267
|\ | | | | | | | | 7521da2 Introduce CMAKE_STAGING_PREFIX variable.
| * Introduce CMAKE_STAGING_PREFIX variable.Stephen Kelly2013-11-2121-9/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This variable can be useful in cross-compiling contexts where the sysroot is read-only or where the sysroot should otherwise remain pristine. If the new CMAKE_STAGING_PREFIX variable is set, it is used instead of CMAKE_INSTALL_PREFIX when generating the installation rules in cmake_install.cmake. This way, the CMAKE_INSTALL_PREFIX variable always refers to the installation prefix on the target device, regardless of whether host==target. If any -rpath paths passed to the linker contain the CMAKE_STAGING_PREFIX, the matching path fragments are replaced with the CMAKE_INSTALL_PREFIX. Matching paths in the -rpath-link are not transformed. The cross-prefix usr-move workaround is assumed not to require extension regarding CMAKE_STAGING_PREFIX. The staging area is a single prefix, so there is no scope for cross-prefix symlinks. The CMAKE_INSTALL_PREFIX is still used to determine the workaround path, and that variable remains the relevant one even if CMAKE_STAGING_PREFIX is used. If the generated export files are deployed to the target, the workaround will still be in place, and still be employed if required.
* | Merge topic 'qt-dialog-reconfigure'Brad King2013-11-221-0/+1
|\ \ | | | | | | | | | | | | b566987 cmake-gui: Configure again if a variable is changed before Generate is pushed.
| * | cmake-gui: Configure again if a variable is changed before Generate is pushed.Clinton Stimpson2013-11-211-0/+1
| | |
* | | CMake Nightly Date StampKitware Robot2013-11-221-1/+1
| | |
* | | Merge topic 'genex-docs'Brad King2013-11-211-77/+171
|\ \ \ | | | | | | | | | | | | | | | | 8e729df Help: Reformat cmake-generator-expressions.7 manual
| * | | Help: Reformat cmake-generator-expressions.7 manualStephen Kelly2013-11-211-77/+171
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use definition lists instead of a preformatted block to enumerate the genex documentation. Consistently capitalize the description. Use ``...`` to format genex parameters in the description. Turn references to commands into links. Add high level documentation about the motivation for generator expressions. Regroup expressions into subsections for different genex types. Add a high-level description and example of the expressions in each section. Explode the documentation for filesystem artifacts, instead of only referring to the variations.
* | | Merge topic 'missing-target-error'Brad King2013-11-2124-23/+148
|\ \ \ | | | | | | | | | | | | | | | | a02f3d2 Add policy CMP0040 to disallow custom commands on missing targets
| * | | Add policy CMP0040 to disallow custom commands on missing targetsNils Gladitz2013-11-2124-23/+148
| |/ /
* | | Merge topic 'cmake-credits'Brad King2013-11-212-6/+14
|\ \ \ | | | | | | | | | | | | | | | | 6fc4ab9 Credit Kitware and csimsoft for their maintenance roles
| * | | Credit Kitware and csimsoft for their maintenance rolesBrad King2013-11-192-6/+14
| | |/ | |/| | | | | | | | | | Add maintenance credit to command-line "--version" output and the cmake-gui "About" dialog.
* | | Merge topic 'FindwxWidgets-3.0.0'Brad King2013-11-211-0/+6
|\ \ \ | | | | | | | | | | | | | | | | 2cd5597 FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)
| * | | FindwxWidgets: Add support for wxWidgets 3.0.0 (#14587)Arnaud Desmier2013-11-201-0/+6
| | |/ | |/| | | | | | | | | | Add the "wxWidgets-3.0.0" path suffix and the "30" library names. While at it, add the "wxWidgets-2.9.5" suffix too.
* | | Merge topic 'find_backtrace'Brad King2013-11-213-0/+93
|\ \ \ | | | | | | | | | | | | | | | | c6f339c Add FindBacktrace.cmake module.
| * | | Add FindBacktrace.cmake module.Vadim Zhukov2013-10-163-0/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It designed to search for implementation of backtrace(3) routine. Currently it is used in OpenBSD Ports for building Clementine music player. A lot of input from brad.king@ and neundorf@.
* | | | CMake Nightly Date StampKitware Robot2013-11-211-1/+1
| |/ / |/| |
* | | Merge topic 'constify'Brad King2013-11-2012-74/+83
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 15eeace cmTarget: Trivially make more API const. be9dfb6 cmTarget: Make GetExportMacro const. 0794c13 cmTarget: Make NameResolvesToFramework const. 1c27521 cmGlobalGenerator: Make NameResolvesToFramework const. 37554ac cmMakefile: Make FindTarget const. 8841d73 cmMakefile: Make IsAlias const. 36e31cd cmTarget: Make GetInterfaceLinkLibraries const. 04d398d cmTarget: Make GetTargetSourceFileFlags const. 50d1520 cmTarget: Make custom command accessors API const. 0f87643 cmGeneratorTarget: Make GetIncludeDirectories const.
| * | | cmTarget: Trivially make more API const.Stephen Kelly2013-11-192-25/+26
| | | |
| * | | cmTarget: Make GetExportMacro const.Stephen Kelly2013-11-192-3/+3
| | | | | | | | | | | | | | | | The std::string member is only used for memory management.
| * | | cmTarget: Make NameResolvesToFramework const.Stephen Kelly2013-11-192-3/+3
| | | |
| * | | cmGlobalGenerator: Make NameResolvesToFramework const.Stephen Kelly2013-11-192-9/+11
| | | |
| * | | cmMakefile: Make FindTarget const.Stephen Kelly2013-11-192-8/+6
| | | |
| * | | cmMakefile: Make IsAlias const.Stephen Kelly2013-11-192-2/+2
| | | |
| * | | cmTarget: Make GetInterfaceLinkLibraries const.Stephen Kelly2013-11-192-2/+2
| | | |
| * | | cmTarget: Make GetTargetSourceFileFlags const.Stephen Kelly2013-11-192-6/+7
| | | |
| * | | cmTarget: Make custom command accessors API const.Stephen Kelly2013-11-197-13/+20
| | | | | | | | | | | | | | | | Add specific mutators instead of providing non-const refs.
| * | | cmGeneratorTarget: Make GetIncludeDirectories const.Stephen Kelly2013-11-192-3/+3
| | | |
* | | | Merge topic 'add-missing-parent-group'Brad King2013-11-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2751b93 CPackComponent: handle the documented PARENT_GROUP parameter
| * | | | CPackComponent: handle the documented PARENT_GROUP parameterNils Gladitz2013-11-191-1/+1
| |/ / /
* | | | Merge topic 'dev/better-eclipse-language-support'Brad King2013-11-207-6/+69
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a990722 eclipse: Support custom natures via a global property 51726cc eclipse: Add natures for Eclipse based on enabled languages 4a352d4 Notify extra generators about languages
| * | | | eclipse: Support custom natures via a global propertyBen Boeckel2013-11-193-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | This is useful for enabling natures not recognized by the Eclipse generator directly in a project.
| * | | | eclipse: Add natures for Eclipse based on enabled languagesBen Boeckel2013-11-192-6/+35
| | | | | | | | | | | | | | | | | | | | Also adds support for the Java nature if Java is being used.
| * | | | Notify extra generators about languagesBen Boeckel2013-11-193-0/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | Some generators can use the any enabled languages to add extra support in the relevant build tool. One such is Eclipse since there are many plugins available for various languages.
* | | | Merge topic 'remove-LOCATION-property-use'Brad King2013-11-208-29/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | a247911 Tests: Don't read the LOCATION property from build targets. cffcdd8 KDevelop: Use GetLocation(0) instead of LOCATION property.
| * | | | Tests: Don't read the LOCATION property from build targets.Stephen Kelly2013-11-197-28/+13
| | | | |
| * | | | KDevelop: Use GetLocation(0) instead of LOCATION property.Stephen Kelly2013-11-191-1/+1
| |/ / / | | | | | | | | | | | | This can be migrated to use cmGeneratorTarget later.
* | | | Merge topic 'fix-help-format-warning-exit'Brad King2013-11-202-13/+16
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | e7434d4 cmDocumentation: Fix exit after help output format warnings
| * | | | cmDocumentation: Fix exit after help output format warningsBrad King2013-11-192-13/+16
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | After warning that a help output format is no longer supported, fix the return value from cmDocumentation::CheckOptions to indicate that it was still a help option that was parsed. Otherwise CMake moves on to treat the help output file name as a source tree and complains that it does not exist.
* | | | Merge topic 'vs9-map-Fd'Brad King2013-11-201-0/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | bf1db49 VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577)
| * | | | VS: Map /Fd to ProgramDataBaseFileName for VS 7,8,9 (#14577)Brad King2013-11-181-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 42ba1b08 (VS: Separate compiler and linker PDB files, 2013-04-05) the VS generators no longer add ProgramDataBaseFileName. Therefore we should allow projects to do so by mapping the /Fd option. For VS >= 10 our flag tables map /Fd to ProgramDataBaseFileName already. Add the mapping for VS 7, 8, and 9.
* | | | | Merge topic 'FindLATEX-ps2pdf'Brad King2013-11-201-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 0767474 FindLATEX: Find ps2pdf with MikTeX.
| * | | | | FindLATEX: Find ps2pdf with MikTeX.Matt McCormick2013-10-241-1/+2
| | | | | |
* | | | | | CMake Nightly Date StampKitware Robot2013-11-201-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'macro-args-docs'Brad King2013-11-194-14/+51
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | f0db2e3 Help: Document macro argument caveats in more detail
| * | | | | Help: Document macro argument caveats in more detailDaniele E. Domenichelli2013-11-194-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add notes about macro arguments in the foreach, if, and list commands. Add a section to the macro command documentation explaining in detail how macro arguments are not variables.
* | | | | | Merge topic 'cross-compiling-toolchain-variables'Brad King2013-11-1916-11/+187
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7cd65c9 Add CMAKE_SYSROOT variable to set --sysroot when cross compiling. 5096967 Allow toolchain files to specify an external toolchain. 76552d5 Add compiler target compile options. f41ecd1 CMakeDetermineCompilerId: Look for internal file only on host
| * | | | | Add CMAKE_SYSROOT variable to set --sysroot when cross compiling.Stephen Kelly2013-11-198-9/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As CMAKE_ROOT_FIND_PATH can be a list, a new CMAKE_SYSROOT is introduced, which is never a list. The contents of this variable is passed to supporting compilers as --sysroot. It is also accounted for when processing implicit link directories reported by the compiler, and when generating RPATH information.
| * | | | | Allow toolchain files to specify an external toolchain.Stephen Kelly2013-11-196-1/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang can compile code, but uses the gcc tools for other tasks such as linking. The -gcc-toolchain option can be used for that, but generalize so that other compilers can be treated the same. If such a location is specified, use it as a hint for finding the binutils executables.
| * | | | | Add compiler target compile options.Stephen Kelly2013-11-198-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For clang, this allows passing -target <triple> to the compiler, and for qcc, -V<arch> using toolchain files containing something like set(triple arm-linux-gnueabihf) set(CMAKE_C_COMPILER "/usr/bin/clang") set(CMAKE_C_COMPILER_TARGET ${triple}) set(CMAKE_CXX_COMPILER "/usr/bin/clang++") set(CMAKE_CXX_COMPILER_TARGET ${triple}) or set(arch gcc_ntoarmv7le) set(CMAKE_C_COMPILER /opt/qnx650/host/linux/x86/usr/bin/qcc) set(CMAKE_C_COMPILER_TARGET ${arch}) set(CMAKE_CXX_COMPILER /opt/qnx650/host/linux/x86/usr/bin/QCC) set(CMAKE_CXX_COMPILER_TARGET ${arch}) Both clang and qcc are inherently cross compiler( driver)s. When cross-compiling with clang, use the CMAKE_${lang}_COMPILER_TARGET as the _CMAKE_TOOLCHAIN_PREFIX to find the appropriate binutils. When cross-compiling with QNX qcc, use the CMAKE_${lang}_COMPILER_TARGET to set the appropriate _CMAKE_TOOLCHAIN_PREFIX.
| * | | | | CMakeDetermineCompilerId: Look for internal file only on hostStephen Kelly2013-11-191-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The find_file this module uses to locate the compiler id source file must always look on the host and never in CMAKE_FIND_ROOT_PATH, even when a toolchain file has set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) Add NO_CMAKE_FIND_ROOT_PATH to the find_file call to avoid rerooting.