summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'wix-fragment-injection'Brad King2013-12-191-0/+51
|\ | | | | | | | | 8632233 CPackWiX: allow customization of generated WiX sources
| * CPackWiX: allow customization of generated WiX sourcesNils Gladitz2013-12-171-0/+51
| | | | | | | | | | | | Added a new variable CPACK_WIX_PATCH_FILE that users can point at an XML patch file. Fragments defined within the patch file will be inserted at supported insertion points (currently Component, File and Directory).
* | Merge topic 'Qt4-NO_DEBUG-define'Brad King2013-12-192-0/+5
|\ \ | | | | | | | | | | | | | | | 3e97bcb Use a config-specific moc parameters file, if needed. b9f0d81 Define QT_NO_DEBUG for non-debug use of Qt 4.
| * | Use a config-specific moc parameters file, if needed.Stephen Kelly2013-12-121-0/+1
| | |
| * | Define QT_NO_DEBUG for non-debug use of Qt 4.Stephen Kelly2013-12-101-0/+4
| |/
* | Merge topic 'FindSubversion-TortoiseSVN'Brad King2013-12-191-0/+2
|\ \ | | | | | | | | | | | | 62c276f FindSubversion: Use TortoiseSVN registry key to locate svn
| * | FindSubversion: Use TortoiseSVN registry key to locate svnDaniele E. Domenichelli2013-12-111-0/+2
| |/ | | | | | | | | | | If TortoiseSVN is not installed in the default path, the svn executable installed by TortoiseSVN is not found. Using the registry key should always find it.
* | Merge topic 'FindFreetype-2.5'Brad King2013-12-191-3/+13
|\ \ | | | | | | | | | | | | | | | | | | 9b08e3f FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRS bc49d82 FindFreetype: Detect version string with Freetype 2.5 7435ae7 FindFreetype: Find ftheader.h with Freetype 2.5
| * | FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRSDaniele E. Domenichelli2013-12-091-0/+1
| | | | | | | | | | | | | | | In Freetype 2.5 the paths for FREETYPE_INCLUDE_DIR_ft2build and FREETYPE_INCLUDE_DIR_freetype2 are the same
| * | FindFreetype: Detect version string with Freetype 2.5Daniele E. Domenichelli2013-12-091-2/+8
| | |
| * | FindFreetype: Find ftheader.h with Freetype 2.5Daniele E. Domenichelli2013-12-091-1/+4
| | |
* | | Merge topic 'xcode-5.1'Brad King2013-12-191-1/+1
|\ \ \ | |_|/ |/| | | | | | | | 65ee85d CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
| * | CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1Ted Kremenek2013-12-091-1/+1
| | | | | | | | | | | | | | | | | | Xcode 5.1 output no longer puts "./" in the path to the linker output for the CompilerId test binary. Update our regex to match the path with or without the component.
* | | Merge topic 'qt4-qmake-exe'Brad King2013-12-091-0/+5
|\ \ \ | | | | | | | | | | | | | | | | 05c518b FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
| * | | FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.Simon Sasburg2013-12-061-0/+5
| | |/ | |/| | | | | | | | | | This fixes a regression in commit 21123416 where it was trying to better handle a qmake from Qt5.
* | | Fortran: Improve pointer size detection in gfortran on MinGWBrad King2013-12-061-0/+4
|/ / | | | | | | | | | | | | | | In commit ecd84147 (Fortran: Detect pointer size in gfortran on MinGW, 2011-11-29) we started testing for __SIZEOF_POINTER__ but not all GNU Fortran compilers define this. Check also for __SIZEOF_SIZE_T__ which at least one version of gfortran defines without also defining __SIZEOF_POINTER__.
* | 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
generated by cgit v0.12 at 2025-01-21 04:47:06 (GMT)