summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cleanup-build-commands'Brad King2013-12-051-14/+23
|\ | | | | | | | | | | e420124 CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND 0c55729 VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variables
| * CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMANDBrad King2013-12-041-14/+23
| | | | | | | | | | | | | | | | | | In the code path for launching the VS IDE tools, avoid using CMAKE_MAKE_PROGRAM. Instead use the variables CMAKE_VS_DEVENV_COMMAND, CMAKE_VS_MSBUILD_COMMAND, and CMAKE_VS_MSDEV_COMMAND to lookup the location of the build tool needed. Choose the proper tool based on availability and necessity for the language (e.g. Intel Fortran must build with devenv.com and not MSBuild.exe).
* | Merge topic 'filter-showincludes-in-launcher'Brad King2013-12-031-3/+25
|\ \ | | | | | | | | | | | | e5e3f3d CTest: filter /showIncludes output from ninja compile launcher
| * | CTest: filter /showIncludes output from ninja compile launcherNils Gladitz2013-12-031-3/+25
| | | | | | | | | | | | | | | Teach "ctest --launch" a new "--filter-prefix" option. Set it using the CMAKE_CL_SHOWINCLUDES_PREFIX value with the Ninja generator.
* | | Merge topic 'Haiku-CPU-count'Brad King2013-12-031-0/+14
|\ \ \ | | | | | | | | | | | | | | | | eef42a0 ProcessorCount: make it work on Haiku
| * | | ProcessorCount: make it work on HaikuRolf Eike Beer2013-12-021-0/+14
| |/ /
* | | Merge topic 'lang-flag-var-helpstrings'Brad King2013-12-033-12/+12
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 5d2452d Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622) 2b77b53 Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606) 424c6fc Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)
| * | | Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings (#14622)Brad King2013-12-033-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | s/defalut/default/ Reported-by: Stephan Tolksdorf <st@quanttec.com>
| * | | Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent (#14606)Brad King2013-12-023-6/+6
| | | | | | | | | | | | | | | | | | | | Use consistent capitalization and write all words out in the cache entry descriptions.
| * | | Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings (#14606)Brad King2013-12-023-3/+3
| |/ / | | | | | | | | | | | | Remove the platform-specific description from the cache entry help strings for these variables.
* | | Merge topic 'osx-cross-compile-fixup'Brad King2013-12-031-1/+3
|\ \ \ | | | | | | | | | | | | | | | | 3189ed3 OS X: Fix app bundle search path during cross compiling (#14603)
| * | | OS X: Fix app bundle search path during cross compiling (#14603)Flynn Marquardt2013-12-021-1/+3
| |/ / | | | | | | | | | | | | In "Modules/Platform/Darwin.cmake" the variable _apps_paths stays empty if cross compiling. Do not de-duplicate an empty list.
* | | Merge topic 'wix-components'Brad King2013-12-022-1/+9
|\ \ \ | | | | | | | | | | | | | | | | 7b390f7 CPackWiX: add CPack component support
| * | | CPackWiX: add CPack component supportNils Gladitz2013-11-262-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Creates a hierarchy of WiX features from CPack components and component groups. Switch to the FeatureTree UI in case components have been defined. Handles the component REQUIRE and HIDDEN options and the component group EXPANDED option.
* | | | Merge topic 'FindSWIG-3498'Brad King2013-12-021-2/+0
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 5d3b0bb FindSWIG: allow to provide SWIG_DIR (#3498)
| * | | | FindSWIG: allow to provide SWIG_DIR (#3498)Julien Schueller2013-12-011-2/+0
| | |/ / | |/| |
* | | | Merge topic 'UseSWIG-octave'Brad King2013-12-021-1/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | f39671c UseSWIG: Handle octave extensions.
| * | | | UseSWIG: Handle octave extensions.Julien Schueller2013-11-291-1/+4
| |/ / /
* | | | Merge topic 'UseSWIG-fix12184'Brad King2013-12-021-2/+12
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 74f5545 UseSWIG: set .bundle ext on OSX and no prefix (#12184)
| * | | | UseSWIG: set .bundle ext on OSX and no prefix (#12184)Julien Schueller2013-11-281-2/+12
| |/ / /
* | | | Merge topic 'UseSWIG-fix13318'Brad King2013-12-021-4/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | a87c063 UseSWIG: Name python module according to swig flags (#13318)
| * | | | UseSWIG: Name python module according to swig flags (#13318)Julien Schueller2013-11-261-4/+7
| | | | |
* | | | | Merge topic 'KateProjectGenerator2'Brad King2013-12-021-0/+31
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | b54c336 kate: add some documentation 9414217 kate: insert build targets 644e012 kate: add project generator for the Kate project plugin
| * | | | kate: add project generator for the Kate project pluginAlex Neundorf2013-11-251-0/+31
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This patch adds an extra generator for KDE's kate text editor, or better more specifically, the project plugin. Alex
* | | | Merge topic 'cross-compiling-toolchain-variables'Brad King2013-11-261-2/+7
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 89ba7b0 Update the Clang pattern to specify compiler options.
| * | | | Update the Clang pattern to specify compiler options.Stephen Kelly2013-11-251-2/+7
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Clang 3.4, the preferred (and new) option pattern is --target=. http://thread.gmane.org/gmane.comp.compilers.clang.devel/29975 http://llvm.org/viewvc/llvm-project?view=revision&revision=184408 Clang 3.4 is not yet released, but there is a release candidate, and there is a dashboard test of Clang trunk.
* | | | 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 '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
* | | | 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 '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 'cross-compiling-toolchain-variables'Brad King2013-11-222-0/+17
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 7521da2 Introduce CMAKE_STAGING_PREFIX variable.
| * | | | | Introduce CMAKE_STAGING_PREFIX variable.Stephen Kelly2013-11-212-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 '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-211-0/+91
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | c6f339c Add FindBacktrace.cmake module.
| * | | | | Add FindBacktrace.cmake module.Vadim Zhukov2013-10-161-0/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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@.