Brad King
050c02849e
Merge topic 'doc-Qt-macro-TARGET-arg'
...
4608a260
Document the TARGET options in Qt4 macros.
2014-01-15 10:12:00 -05:00
Stephen Kelly
4608a260d4
Document the TARGET options in Qt4 macros.
...
Feature introduced in commit 9ce60ff5
(Qt4Macros: Allow specifying
a TARGET in invokations of macros., 2013-02-26).
2014-01-14 14:55:05 +01:00
Stephen Kelly
2509c7678f
Qt4: Use generator expression in COMPILE_DEFINITIONS ( #14692 )
...
Commit 5bb53f6b
(cmTarget: Deprecate COMPILE_DEFINITIONS_ properties
with a policy., 2013-12-30) deprecated the config-specific
COMPILE_DEFINITIONS_* properties in favour of using generator
expressions.
Set the directory property in UseQt4.cmake to match the
INTERFACE_COMPILE_DEFINITIONS on the Qt4::QtCore and Qt5::Core
IMPORTED targets. Setting QT_NO_DEBUG is sufficient because qglobal.h
sets the corresponding QT_DEBUG definition if required.
2014-01-13 15:53:00 +01:00
Brad King
aacad3238f
Merge topic 'find-java-os-x-fixes'
...
519084c
FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508 )
2014-01-10 09:19:46 -05:00
Brad King
58b34959e3
Merge topic 'CheckTypeSize_fix_multiple_invocation'
...
8252406
CheckTypeSize: Unset temporary variables when done (#14690 )
2014-01-10 09:19:44 -05:00
Daniele E. Domenichelli
8252406cd6
CheckTypeSize: Unset temporary variables when done ( #14690 )
...
When the macro is invoked multiple times, the parsing variables were
not unset and therefore used for all the following calls.
2014-01-10 09:16:30 -05:00
Brad King
089ae7122b
Merge topic 'FindBoost-ms-debug-runtime'
...
d729899
FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686 )
2014-01-09 13:54:21 -05:00
Joe Abbey
519084cd2e
FindJNI: Set JAVA_INCLUDE_PATH2 for darwin ( #14508 )
2014-01-09 09:59:56 -05:00
Brad King
15562c11ef
Merge topic 'policies'
...
73e9340
get_target_property: Error on non-existent target.
ab9f58f
FindQt4: Ensure target exists before calling get_target_property.
37ebeb9
FindQt4: Fix use of get_target_property to use actual target name.
6aabb6a
Genex: Use case-sensitive comparison for COMPILER_ID.
5bb53f6
cmTarget: Deprecate COMPILE_DEFINITIONS_ properties with a policy.
2014-01-09 09:37:20 -05:00
Brad King
df55a930fa
Merge topic 'qt4-find-root'
...
e8b8b37
FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
2014-01-09 09:37:12 -05:00
Brad King
e5783a6f51
Merge topic 'multiarch-multios'
...
f293d52
GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels
2014-01-09 09:37:09 -05:00
Brad King
d729899a26
FindBoost: Add Boost_USE_DEBUG_RUNTIME option ( #14686 )
...
Add an option to control use of the 'g' runtime debug library tag
on MSVC tools. Default to ON to preserve existing behavior.
2014-01-08 11:32:17 -05:00
Stephen Kelly
ab9f58f657
FindQt4: Ensure target exists before calling get_target_property.
...
This macro is called for all potential Qt targets, even those which were
not found.
2014-01-08 16:41:34 +01:00
Stephen Kelly
37ebeb9100
FindQt4: Fix use of get_target_property to use actual target name.
...
This was introduced in ba48e63f
(Generate config-specific interface
link libraries propeties., 2013-02-09).
2014-01-08 16:41:34 +01:00
Brad King
1857660984
Merge topic 'wix-cmake-package-registry'
...
92c4d40
CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variable
2014-01-08 09:58:45 -05:00
Clinton Stimpson
e8b8b37ef6
FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
...
Thanks to Thomas Petazzoni for part of this fix.
2014-01-08 06:07:24 -07:00
Nils Gladitz
92c4d4039e
CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variable
...
Allows automatic registration of installed packages with
the cmake package registry.
2014-01-08 01:28:24 +01:00
Stephen Kelly
efc43cde8f
Help: Fix some erroneous code block markers in Module docs.
...
There are many style errors in these files. This patch fixes only
the syntactical errors.
The script which ported these to rst tripped on some incorrectly
formatted blocks in the original input documentation. Use a new
script to find problematic code (and then fix them manually):
#!/usr/bin/env python
import os
rootDir = '.'
def checkFile(fname):
f = open(fname)
lines = f.readlines()
started = False
counter = 0
for l in lines:
if "#" in l:
started = True
elif started:
return
lin = l.find("(")
if lin != -1 and l.find(")", lin) == -1 and \
not "(To distribute this file outside of CMake, substitute the full" in l:
for lp in lines[counter+1:]:
if lp == "# ::\n":
print "\n\n######### " + fname + "\n\n"
print ''.join(lines[max(counter-2, 0):counter+6])
break
elif lp == "#\n" :
continue
break
counter += 1
for dirName, subdirList, fileList in os.walk(rootDir):
for fname in fileList:
checkFile(os.path.join(dirName, fname))
2014-01-07 09:52:56 -05:00
Brad King
b225dbbd02
Merge topic 'minor-cleanups'
...
a55c70d
cmTarget: Remove support for <CONFIG>_LOCATION property.
c9f9b3c
cmTarget: Test impliedByUse number-compatible properties.
fbe1fa7
cmTarget: Don't repeat property origin debug information.
01c545c
cmTarget: Fix debug report for interface-set compatibility types.
c67e1a6
cmTarget: Fix reporting interface-set properties which are FALSE.
07b0f54
Qt Tests: Remove commented and unneeded line.
79db8ef
cmTarget: Fix the property compatibility error message
43340a9
Help: Reformat Qt autogenerator documentation.
d98ea6c
Help: Mark some code blocks as containing cmake code.
ea78935
GenerateExportHeader: Reformat docs.
272a20f
cmTarget: Don't update IMPORTED target compilation properties
03d842a
Run the add_compile_options command unit test.
cd3d0b6
get_property: Fix testing ALIASED_TARGET target property (#14670 )
6a62228
install: Ensure that install(TARGETS) works with no DESTINATION
af3d3b8
export: Only generate and install configuration files if needed.
0de81bb
Help: Workaround pygments reporting an error for genexes.
...
2014-01-06 11:15:34 -05:00
Brad King
b8786da79f
Merge topic 'fix-text-typos'
...
9e41eb6
Fix wording of "the the" typos throughout text
2014-01-06 10:36:03 -05:00
Stephen Kelly
ea78935f62
GenerateExportHeader: Reformat docs.
2014-01-04 11:28:57 +01:00
Ruslan Baratov
9e41eb68ec
Fix wording of "the the" typos throughout text
2014-01-03 11:35:32 -05: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
Dimitri John Ledkov
f293d525a1
GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels
2013-12-19 11:27:30 -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