summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'doc-Qt-macro-TARGET-arg'Brad King2014-01-151-7/+13
|\ | | | | | | | | 4608a260 Document the TARGET options in Qt4 macros.
| * Document the TARGET options in Qt4 macros.Stephen Kelly2014-01-141-7/+13
| | | | | | | | | | Feature introduced in commit 9ce60ff5 (Qt4Macros: Allow specifying a TARGET in invokations of macros., 2013-02-26).
* | Qt4: Use generator expression in COMPILE_DEFINITIONS (#14692)Stephen Kelly2014-01-131-7/+1
|/ | | | | | | | | | | | 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.
* Merge topic 'find-java-os-x-fixes'Brad King2014-01-101-0/+1
|\ | | | | | | | | 519084c FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)
| * FindJNI: Set JAVA_INCLUDE_PATH2 for darwin (#14508)Joe Abbey2014-01-091-0/+1
| |
* | Merge topic 'CheckTypeSize_fix_multiple_invocation'Brad King2014-01-101-0/+2
|\ \ | | | | | | | | | | | | 8252406 CheckTypeSize: Unset temporary variables when done (#14690)
| * | CheckTypeSize: Unset temporary variables when done (#14690)Daniele E. Domenichelli2014-01-101-0/+2
| | | | | | | | | | | | | | | When the macro is invoked multiple times, the parsing variables were not unset and therefore used for all the following calls.
* | | Merge topic 'FindBoost-ms-debug-runtime'Brad King2014-01-091-1/+7
|\ \ \ | |/ / |/| | | | | | | | d729899 FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686)
| * | FindBoost: Add Boost_USE_DEBUG_RUNTIME option (#14686)Brad King2014-01-081-1/+7
| |/ | | | | | | | | Add an option to control use of the 'g' runtime debug library tag on MSVC tools. Default to ON to preserve existing behavior.
* | Merge topic 'policies'Brad King2014-01-091-11/+15
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | FindQt4: Ensure target exists before calling get_target_property.Stephen Kelly2014-01-081-11/+15
| | | | | | | | | | | | | | | This macro is called for all potential Qt targets, even those which were not found.
| * | FindQt4: Fix use of get_target_property to use actual target name.Stephen Kelly2014-01-081-1/+1
| | | | | | | | | | | | | | | This was introduced in ba48e63f (Generate config-specific interface link libraries propeties., 2013-02-09).
* | | Merge topic 'qt4-find-root'Brad King2014-01-091-2/+5
|\ \ \ | | | | | | | | | | | | | | | | e8b8b37 FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.
| * | | FindQt4: Use NO_CMAKE_FIND_ROOT_PATH where search paths are already rooted.Clinton Stimpson2014-01-081-2/+5
| | | | | | | | | | | | | | | | Thanks to Thomas Petazzoni for part of this fix.
* | | | Merge topic 'multiarch-multios'Brad King2014-01-091-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | f293d52 GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernels
| * | | GNUInstallDirs: Use multiarch on Debian with FreeBSD and HURD kernelsDimitri John Ledkov2013-12-191-1/+1
| | | |
* | | | Merge topic 'wix-cmake-package-registry'Brad King2014-01-081-0/+11
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 92c4d40 CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variable
| * | | | CPackWiX: added new CPACK_WIX_CMAKE_PACKAGE_REGISTRY variableNils Gladitz2014-01-081-0/+11
| | |_|/ | |/| | | | | | | | | | | | | | Allows automatic registration of installed packages with the cmake package registry.
* | | | Help: Fix some erroneous code block markers in Module docs.Stephen Kelly2014-01-075-43/+19
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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))
* | | Merge topic 'minor-cleanups'Brad King2014-01-061-64/+51
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. ...
| * | | GenerateExportHeader: Reformat docs.Stephen Kelly2014-01-041-64/+51
| | |/ | |/|
* | | Merge topic 'fix-text-typos'Brad King2014-01-062-3/+3
|\ \ \ | |/ / |/| | | | | | | | 9e41eb6 Fix wording of "the the" typos throughout text
| * | Fix wording of "the the" typos throughout textRuslan Baratov2014-01-032-3/+3
| | |
* | | Merge topic 'export-EXPORT-subcommand'Brad King2014-01-021-9/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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)
| * | | Don't copy find_dependency in configure_package_config_file.Stephen Kelly2013-12-241-9/+2
| |/ / | | | | | | | | | | | | | | | | | | 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.
* | | CPackWiX: allow and convert UTF-8 sequences in RTF writerNils Gladitz2013-12-261-0/+1
|/ /
* | Merge topic 'cmake-packages-manual'Brad King2013-12-202-31/+62
|\ \ | | | | | | | | | | | | | | | 3fe4ac8 Help: Add a CMake manual for Packages related docs. 20cafa2 Split the find_dependency macro into a separate file.
| * | Split the find_dependency macro into a separate file.Stephen Kelly2013-12-132-31/+62
| | | | | | | | | | | | | | | This allows Config file authors to use it without having to use CONFIGURE_PACKAGE_CONFIG_FILE.
* | | Merge topic 'add-platform-MirBSD'Brad King2013-12-201-0/+1
|\ \ \ | | | | | | | | | | | | | | | | af7489d Add MirBSD platform support (#14659)
| * | | Add MirBSD platform support (#14659)Brad King2013-12-191-0/+1
| | | | | | | | | | | | | | | | | | | | Add a Modules/Platform/MirBSD.cmake module that just includes the OpenBSD platform module.
* | | | Merge topic 'doc-TestCXXAcceptsFlag-cleanup'Brad King2013-12-201-7/+9
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 95c705a TestCXXAcceptsFlag: Update documentation (#14657)
| * | | | TestCXXAcceptsFlag: Update documentation (#14657)Brad King2013-12-191-7/+9
| |/ / / | | | | | | | | | | | | | | | | Document this module as deprecated and link to CheckCXXCompilerFlag. Fix cut-n-paste-o and format macro signature.
* | | | Merge topic 'find_backtrace'Brad King2013-12-201-7/+10
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 9650c09 FindBacktrace: Search and report only when not already found
| * | | FindBacktrace: Search and report only when not already foundVadim Zhukov2013-12-191-7/+10
| | |/ | |/| | | | | | | | | | | | | Avoid saying "... detected in default set..." each time CMake is run. Prompted by Rolf Eike Beer on cmake-developers@.
* | | 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__.
generated by cgit v0.12 at 2024-12-29 05:43:23 (GMT)