summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'libarchive-left-shift-fix'Brad King2013-11-261-11/+7
|\ | | | | | | | | 5ee1297 libarchive: Port upstream issue 320 fix
| * libarchive: Port upstream issue 320 fixBrad King2013-11-251-11/+7
| | | | | | | | | | | | | | Port upstream commit 533e8fda (Rework the sign-extension to avoid left-shift of an explicit negative number, 2013-06-29) into CMake. Inspired-by: Tim Kientzle <kientzle@freebsd.org>
* | Merge topic 'INTERFACE_LIBRARY-property-whitelist'Brad King2013-11-2619-81/+256
|\ \ | | | | | | | | | | | | | | | 5ee9e6b cmTarget: Add whitelist of properties on INTERFACE_LIBRARY. 0bfcb45 INTERFACE_LIBRARY: Avoid codepaths which set unneeded properties.
| * | cmTarget: Add whitelist of properties on INTERFACE_LIBRARY.Stephen Kelly2013-11-256-0/+103
| | |
| * | INTERFACE_LIBRARY: Avoid codepaths which set unneeded properties.Stephen Kelly2013-11-2514-81/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As an INTERFACE_LIBRARY has no direct link dependencies, we can short-circuit in cmGeneratorExpressionEvaluator and in cmGlobalGenerator::CheckLocalGenerators. As they do not generate any output directly, any generate- or install- related code acn also be short-circuited. Many of the local generators already do this. Because only INTERFACE related properties make sense on INTERFACE_LIBRARY targets, avoid setting other properties, for example via defaults.
* | | Merge topic 'UseSWIG-fix14520'Brad King2013-11-261-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 20028d6 UseSWIG: Remove duplicate include dirs (#14520)
| * | | UseSWIG: Remove duplicate include dirs (#14520)Julien Schueller2013-11-251-0/+1
| | | | | | | | | | | | | | | | Shorten the swig command line.
* | | | Merge topic 'UseSWIG-fix13814'Brad King2013-11-261-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | acc59e5 UseSWIG: Handle a dll name different than module name (#13814)
| * | | | UseSWIG: Handle a dll name different than module name (#13814)Julien Schueller2013-11-251-0/+4
| | | | |
* | | | | Merge topic 'ninja-quoted-cmd-commands'Brad King2013-11-261-7/+23
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b6f1142 Ninja: multiple commands must be quoted
| * | | | | Ninja: multiple commands must be quotedPeter Kümmel2013-11-251-7/+23
| | | | | | | | | | | | | | | | | | | | | | | | Bug 14370
* | | | | | Merge topic 'ninja-msvc-deps-for-intel'Brad King2013-11-261-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 76a8888 Ninja: deptype msvc for Intel's compiler on Windows
| * | | | | | Ninja: deptype msvc for Intel's compiler on WindowsPeter Kümmel2013-11-251-4/+5
| |/ / / / /
* | | | | | Merge topic 'FindGTK2-quartz-backend'Brad King2013-11-261-2/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0e9bf6a FindGTK2: Add support for Quartz backend on MAC
| * | | | | | FindGTK2: Add support for Quartz backend on MACDaniele E. Domenichelli2013-11-241-2/+12
| | |/ / / / | |/| | | | | | | | | | | | | | | | Fix issue #14593
* | | | | | CMake Nightly Date StampKitware Robot2013-11-261-1/+1
| |_|_|_|/ |/| | | |
* | | | | Merge topic 'doc-generators-cleanup'Brad King2013-11-2515-142/+122
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | beec9db Help: Organize and revise the cmake-generators.7 manual
| * | | | Help: Organize and revise the cmake-generators.7 manualBrad King2013-11-2515-142/+122
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Move "extra" generators to their own section instead of duplicating them for each corresponding main generator. Divide the list of main generators into command-line and IDE sections and sort the names within each section. Document the environment from which each kind of generator may be used. Add a section to each "extra" generator documenting which main generators may be used with it.
* | | | Merge topic 'doc-cmake-language-env-vars'Brad King2013-11-251-0/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 45a03aa Help: Document $ENV{VAR} syntax in cmake-language.7 manual
| * | | | Help: Document $ENV{VAR} syntax in cmake-language.7 manualBrad King2013-11-251-0/+3
|/ / / /
* | | | Merge topic 'EclipseParallelMakeOnlyOnUnixHosts'Brad King2013-11-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 83751af Eclipse: add -j only on UNIX hosts
| * | | | Eclipse: add -j only on UNIX hostsAlex Neundorf2013-11-231-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous version added -jN to the make invokation if UNIX was set, but this was true also when cross compiling. What we are actually interested in is CMAKE_HOST_UNIX, i.e. whether the build host is UNIX. Or we should check more exactly what CMAKE_MAKE_PROGRAM is. Alex
* | | | Merge topic 'UseSWIG-fix13772'Brad King2013-11-251-30/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 276e373 UseSWIG: Fix .i relative source file location (#13173,#13772,#14459)
| * | | | UseSWIG: Fix .i relative source file location (#13173,#13772,#14459)Julien Schueller2013-11-251-30/+2
| |/ / /
* | | | Merge topic 'FindSWIG-fix13771'Brad King2013-11-251-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 8c127c9 FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)
| * | | | FindSWIG: Use CMAKE_CURRENT_LIST_DIR instead of CMAKE_ROOT (#13771)Julien Schueller2013-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | This is a simpler way to reference the location of UseSWIG.cmake.
* | | | | Merge topic 'FindSWIG-fix13449'Brad King2013-11-251-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 19b7a54 FindSWIG: Search for swig.swg only on host (#13449)
| * | | | | FindSWIG: Search for swig.swg only on host (#13449)Julien Schueller2013-11-221-1/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | Use NO_CMAKE_FIND_ROOT_PATH to ensure swig.swg can be found on the host even when cross-compiling.
* | | | | Merge topic 'FindSWIG-fix13426'Brad King2013-11-251-0/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 6620dc7 FindSWIG: Mark SWIG_DIR & SWIG_VERSION as advanced (#13426)
| * | | | | FindSWIG: Mark SWIG_DIR & SWIG_VERSION as advanced (#13426)Julien Schueller2013-11-221-0/+2
| |/ / / /
* | | | | Merge topic 'use-generator-target'Brad King2013-11-2521-118/+172
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c34968a Port some of the generator API to cmGeneratorTarget. abb13ea Order cmGeneratorTargetsType elements deterministically.
| * | | | | Port some of the generator API to cmGeneratorTarget.Stephen Kelly2013-11-2219-117/+154
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just enough to reach the BuildMacContentDirectory method and the NeedRelinkBeforeInstall methods. In the future, those methods can be moved to cmGeneratorTarget.
| * | | | | Order cmGeneratorTargetsType elements deterministically.Stephen Kelly2013-11-222-1/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define a custom ordering functor to deterministically and strictly order the cmTarget* key. Otherwise the order would be dependent on runtime pointer values, which breaks assumptions of some generators. The functor orders first by target name, and then by directory. Multiple global targets may have the same name, such as edit_cache, but their directory differentiates them.
* | | | | | Merge topic 'make-cpack-options-boolean'Brad King2013-11-251-7/+7
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | 5bc6444 CPack: use IsOn instead of IsSet for boolean CPack options
| * | | | | CPack: use IsOn instead of IsSet for boolean CPack optionsNils Gladitz2013-11-191-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The CPackComponent macros specifically set CPack options to FALSE which CPack previously interpreted to mean "true".
* | | | | | CMake Nightly Date StampKitware Robot2013-11-251-1/+1
| |_|_|_|/ |/| | | |
* | | | | CMake Nightly Date StampKitware Robot2013-11-241-1/+1
| |_|_|/ |/| | |
* | | | CMake Nightly Date StampKitware Robot2013-11-231-1/+1
| |/ / |/| |
* | | Merge topic 'FixIssue14029'Brad King2013-11-226-7/+37
|\ \ \ | | | | | | | | | | | | | | | | 9619719 FindSDL: Add additional search paths on MSVC (#14029)
| * | | FindSDL: Add additional search paths on MSVC (#14029)Benjamin Eikel2013-11-216-7/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add an architecture-specific library directory path suffix for each component. Use different search path for SDL_sound. Project files in VisualC directory suggest that a win32lib will hold the libraries. Reported-by: Paul Hampson <Paul.Hampson@Pobox.com>
* | | | Merge topic 'add-cmHasLiteralPrefix'Brad King2013-11-2217-35/+58
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | 4fe963f Use new cmHasLiteralPrefix function 7d4b2b2 cmStandardIncludes: Add new cmHasLiteralPrefix function.
| * | | | Use new cmHasLiteralPrefix functionStephen Kelly2013-11-2116-34/+33
| | | | |
| * | | | cmStandardIncludes: Add new cmHasLiteralPrefix function.Stephen Kelly2013-11-211-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows avoiding error-prone hard-coding of literal string lengths. Borland is not able to process the template version of this method. Make it use the macro version instead. This means that Borland will also use the macro versions of cmArray*.
* | | | | Merge topic 'cmake-credits'Brad King2013-11-228-0/+531
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 8ad8a9b cmake-gui: Reference LGPLv2.1 when redistributing Qt
| * | | | | cmake-gui: Reference LGPLv2.1 when redistributing QtBrad King2013-11-218-0/+531
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Download http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and place it as Licenses/LGPLv2.1.txt in our source tree. When building cmake-gui, use option CMake_GUI_DISTRIBUTE_WITH_Qt_LGPL to enable notification in the "About" dialog of how the distribution of Qt is licensed. Install the license file as ${CMAKE_ROOT}/Licenses/LGPLv2.1.txt so that the dialog can display a path to it.
* | | | | | Merge topic 'use-generator-target'Brad King2013-11-221-2/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | aa29e64 Add a null check to the generator target accessor.
| * | | | | | Add a null check to the generator target accessor.Stephen Kelly2013-11-211-2/+5
| | | | | | |
* | | | | | | 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.