Stephen Kelly
ea78935f62
GenerateExportHeader: Reformat docs.
2014-01-04 11:28:57 +01:00
Brad King
6cff2afc8b
Merge topic 'export-EXPORT-subcommand'
...
98b9f52
Help: Document export(EXPORT) in the cmake-packages manual.
a1d2bda
Don't copy find_dependency in configure_package_config_file.
f4f6529
Help: cmake-packages: Add missing slash.
cbe7e8f
export: Implement EXPORT subcommand (#9822 )
2014-01-02 14:44:08 -05:00
Nils Gladitz
950d76ed48
CPackWiX: allow and convert UTF-8 sequences in RTF writer
2013-12-26 15:23:54 +01:00
Stephen Kelly
a1d2bda23e
Don't copy find_dependency in configure_package_config_file.
...
There is not really any need to. Downstreams can either rely on it
being provided by CMake, or copy and distribute it.
Change the documented include for the find_dependency macro.
2013-12-24 13:02:49 +01:00
Brad King
4372365177
Merge topic 'cmake-packages-manual'
...
3fe4ac8
Help: Add a CMake manual for Packages related docs.
20cafa2
Split the find_dependency macro into a separate file.
2013-12-20 15:01:26 -05:00
Brad King
c57aca394e
Merge topic 'add-platform-MirBSD'
...
af7489d
Add MirBSD platform support (#14659 )
2013-12-20 09:41:36 -05:00
Brad King
221c95da88
Merge topic 'doc-TestCXXAcceptsFlag-cleanup'
...
95c705a
TestCXXAcceptsFlag: Update documentation (#14657 )
2013-12-20 09:41:18 -05:00
Brad King
c6072c7806
Merge topic 'find_backtrace'
...
9650c09
FindBacktrace: Search and report only when not already found
2013-12-20 09:41:10 -05:00
Brad King
af7489d5a6
Add MirBSD platform support ( #14659 )
...
Add a Modules/Platform/MirBSD.cmake module that just includes the
OpenBSD platform module.
2013-12-19 11:08:28 -05:00
Brad King
95c705a6a9
TestCXXAcceptsFlag: Update documentation ( #14657 )
...
Document this module as deprecated and link to CheckCXXCompilerFlag.
Fix cut-n-paste-o and format macro signature.
2013-12-19 10:41:40 -05:00
Vadim Zhukov
9650c09b95
FindBacktrace: Search and report only when not already found
...
Avoid saying "... detected in default set..." each time CMake is run.
Prompted by Rolf Eike Beer on cmake-developers@.
2013-12-19 10:22:04 -05:00
Brad King
eb20fab736
Merge topic 'wix-fragment-injection'
...
8632233
CPackWiX: allow customization of generated WiX sources
2013-12-19 10:13:47 -05:00
Brad King
aed192d2cd
Merge topic 'Qt4-NO_DEBUG-define'
...
3e97bcb
Use a config-specific moc parameters file, if needed.
b9f0d81
Define QT_NO_DEBUG for non-debug use of Qt 4.
2013-12-19 10:13:23 -05:00
Brad King
cc054e94f8
Merge topic 'FindSubversion-TortoiseSVN'
...
62c276f
FindSubversion: Use TortoiseSVN registry key to locate svn
2013-12-19 10:13:09 -05:00
Brad King
172f37be33
Merge topic 'FindFreetype-2.5'
...
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
2013-12-19 10:12:25 -05:00
Brad King
b891af9290
Merge topic 'xcode-5.1'
...
65ee85d
CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.1
2013-12-19 10:12:18 -05:00
Nils Gladitz
8632233a2f
CPackWiX: allow customization of generated WiX sources
...
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).
2013-12-17 14:14:42 +01:00
Stephen Kelly
20cafa2e1f
Split the find_dependency macro into a separate file.
...
This allows Config file authors to use it without having to use
CONFIGURE_PACKAGE_CONFIG_FILE.
2013-12-13 16:14:02 +01:00
Stephen Kelly
3e97bcb1ef
Use a config-specific moc parameters file, if needed.
2013-12-12 18:22:17 +01:00
Daniele E. Domenichelli
62c276f03e
FindSubversion: Use TortoiseSVN registry key to locate svn
...
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.
2013-12-11 13:59:48 +01:00
Stephen Kelly
b9f0d81c4b
Define QT_NO_DEBUG for non-debug use of Qt 4.
2013-12-10 18:33:52 +01:00
Daniele E. Domenichelli
9b08e3f599
FindFreetype: Remove duplicates in FREETYPE_INCLUDE_DIRS
...
In Freetype 2.5 the paths for FREETYPE_INCLUDE_DIR_ft2build and
FREETYPE_INCLUDE_DIR_freetype2 are the same
2013-12-09 19:39:28 +01:00
Daniele E. Domenichelli
bc49d820a2
FindFreetype: Detect version string with Freetype 2.5
2013-12-09 19:33:42 +01:00
Ted Kremenek
65ee85d0c5
CMakeDetermineCompilerId: Fix compiler line match for Xcode 5.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.
2013-12-09 10:40:42 -05:00
Brad King
1c95ec6316
Merge topic 'qt4-qmake-exe'
...
05c518b
FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
2013-12-09 10:33:11 -05:00
Daniele E. Domenichelli
7435ae7c97
FindFreetype: Find ftheader.h with Freetype 2.5
2013-12-09 13:24:28 +01:00
Simon Sasburg
05c518b3de
FindQt4: Restore ability to handle a changed QT_QMAKE_EXECUTABLE properly.
...
This fixes a regression in commit 21123416
where it was trying to better handle
a qmake from Qt5.
2013-12-06 08:07:38 -07:00
Brad King
5da1580ada
Fortran: Improve pointer size detection in gfortran on MinGW
...
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__.
2013-12-06 09:02:27 -05:00
Brad King
520ead7200
Merge topic 'cleanup-build-commands'
...
e420124
CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND
0c55729
VS: Add CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND variables
2013-12-05 09:24:59 -05:00
Brad King
e4201248ce
CMakeDetermineCompilerId: Use CMAKE_VS_(DEVENV|MSBUILD|MSDEV)_COMMAND
...
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).
2013-12-04 11:06:44 -05:00
Brad King
07528f78d7
Merge topic 'filter-showincludes-in-launcher'
...
e5e3f3d
CTest: filter /showIncludes output from ninja compile launcher
2013-12-03 09:48:09 -05:00
Brad King
1af0c41278
Merge topic 'Haiku-CPU-count'
...
eef42a0
ProcessorCount: make it work on Haiku
2013-12-03 09:30:31 -05:00
Brad King
2e8ce4d516
Merge topic 'lang-flag-var-helpstrings'
...
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 )
2013-12-03 09:30:27 -05:00
Brad King
da47c9733b
Merge topic 'osx-cross-compile-fixup'
...
3189ed3
OS X: Fix app bundle search path during cross compiling (#14603 )
2013-12-03 09:30:18 -05:00
Nils Gladitz
e5e3f3d4ff
CTest: filter /showIncludes output from ninja compile launcher
...
Teach "ctest --launch" a new "--filter-prefix" option. Set it using
the CMAKE_CL_SHOWINCLUDES_PREFIX value with the Ninja generator.
2013-12-03 09:25:53 -05:00
Brad King
5d2452d89a
Fix CMAKE_(C|CXX|Fortran)_STANDARD_LIBRARIES helpstrings ( #14622 )
...
s/defalut/default/
Reported-by: Stephan Tolksdorf <st@quanttec.com>
2013-12-03 09:21:33 -05:00
Brad King
ed1de30da0
Merge topic 'wix-components'
...
7b390f7
CPackWiX: add CPack component support
2013-12-02 12:07:24 -05:00
Brad King
55f2a3d627
Merge topic 'FindSWIG-3498'
...
5d3b0bb
FindSWIG: allow to provide SWIG_DIR (#3498 )
2013-12-02 12:07:17 -05:00
Brad King
fa894c3003
Merge topic 'UseSWIG-octave'
...
f39671c
UseSWIG: Handle octave extensions.
2013-12-02 12:07:03 -05:00
Brad King
f3a10191e7
Merge topic 'UseSWIG-fix12184'
...
74f5545
UseSWIG: set .bundle ext on OSX and no prefix (#12184 )
2013-12-02 12:06:57 -05:00
Brad King
406635fd6c
Merge topic 'UseSWIG-fix13318'
...
a87c063
UseSWIG: Name python module according to swig flags (#13318 )
2013-12-02 12:06:50 -05:00
Brad King
9c56366250
Merge topic 'KateProjectGenerator2'
...
b54c336
kate: add some documentation
9414217
kate: insert build targets
644e012
kate: add project generator for the Kate project plugin
2013-12-02 12:06:27 -05:00
Rolf Eike Beer
eef42a0de6
ProcessorCount: make it work on Haiku
2013-12-02 17:51:47 +01:00
Brad King
2b77b53280
Make CMAKE_(C|CXX|Fortran)_<CONFIG> help strings more consistent ( #14606 )
...
Use consistent capitalization and write all words out in the cache entry
descriptions.
2013-12-02 10:41:12 -05:00
Brad King
424c6fcc76
Fix CMAKE_(C|CXX|Fortran)_RELEASE helpstrings ( #14606 )
...
Remove the platform-specific description from the cache entry help
strings for these variables.
2013-12-02 10:25:52 -05:00
Flynn Marquardt
3189ed34b8
OS X: Fix app bundle search path during cross compiling ( #14603 )
...
In "Modules/Platform/Darwin.cmake" the variable _apps_paths stays empty
if cross compiling. Do not de-duplicate an empty list.
2013-12-02 09:32:40 -05:00
Julien Schueller
5d3b0bb501
FindSWIG: allow to provide SWIG_DIR ( #3498 )
2013-12-01 01:20:46 +01:00
Julien Schueller
f39671c117
UseSWIG: Handle octave extensions.
2013-11-29 10:13:27 +01:00
Julien Schueller
74f5545d0a
UseSWIG: set .bundle ext on OSX and no prefix ( #12184 )
2013-11-28 10:26:14 +01:00
Nils Gladitz
7b390f75e8
CPackWiX: add CPack component support
...
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.
2013-11-26 22:15:57 +01:00