summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'cmake-qt-manual'Brad King2014-02-031-72/+1
|\ | | | | | | | | | | | | 4271a4ed Help: Add information about INTERFACE_AUTOUIC_OPTIONS. 7935f4de Help: Note that AUTOMOC consumes the defines and includes from targets. 2739a6f9 Help: Move Qt tool invocation information to a generic cmake-qt manual.
| * Help: Move Qt tool invocation information to a generic cmake-qt manual.Stephen Kelly2014-02-021-72/+1
| | | | | | | | | | | | | | | | Add an introduction about the use of different package types, and the ability to use Qt 4 and 5 versions together in a single buildsystem. Add a section about automatic linking of the qtmain.lib library and how to disable it.
* | Merge topic 'FindCUDA-doc-format'Brad King2014-02-031-161/+4
|\ \ | | | | | | | | | | | | 1f8eb5db FindCUDA: Fix literal block formatting
| * | FindCUDA: Fix literal block formattingBrad King2014-01-291-161/+4
| |/ | | | | | | Fix locations of '::' manually to group literal blocks as desired.
* | Merge topic 'find-java-os-x-fixes'Brad King2014-02-033-56/+132
|\ \ | | | | | | | | | | | | | | | | | | | | | dd72b19f Find{Java,JNI}: Use /usr/libexec/java_home on OS X 70560ee1 FindJNI: Overhaul finding JDK libraries and headers on OS X fcd66a7f Find{Java,JNI}: Consider JAVA_HOME before ENV{JAVA_HOME} 4b3614b2 Find{Java,JNI}: Use ENV{JAVA_HOME} first when set
| * | Find{Java,JNI}: Use /usr/libexec/java_home on OS XBrad King2014-01-291-0/+11
| | | | | | | | | | | | | | | | | | | | | If no JAVA_HOME or ENV{JAVA_HOME} is set then try running this tool to get the system default Java home. Suggested-by: Larry Shaffer <larrys@dakotacarto.com>
| * | FindJNI: Overhaul finding JDK libraries and headers on OS XBrad King2014-01-291-36/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Drop the hard-coded framework paths and "-framework JavaJM" on APPLE. Save and restore the value of CMAKE_FIND_FRAMEWORK. Use its value to choose and order between a normal search for jvm&jawt and a framework search for JavaVM. When JAVA_HOME is set explicitly by the user then force a normal search by setting CMAKE_FIND_FRAMEWORK to NEVER. Once the library is found, set CMAKE_FIND_FRAMEWORK to help find_path locate the matching headers (framework v. normal).
| * | Find{Java,JNI}: Consider JAVA_HOME before ENV{JAVA_HOME}Brad King2014-01-293-5/+40
| | | | | | | | | | | | | | | | | | Add a helper module CMakeFindJavaCommon shared between FindJava and FindJNI to select a JAVA_HOME value. Prefer a CMake variable or cache entry first, then an environment variable.
| * | Find{Java,JNI}: Use ENV{JAVA_HOME} first when setBrad King2014-01-292-17/+27
| |/ | | | | | | | | | | Use list(APPEND) instead of set() to append to lists. When ENV{JAVA_HOME} is set explicitly place values based on it at the front their lists.
* | Merge topic 'project-version-variables'Brad King2014-02-032-3/+10
|\ \ | |/ |/| | | | | | | | | | | 41d2f2c4 write_basic_package_version_file: use PROJECT_VERSION 7e142c5a project: Manage VERSION variables 16d040c9 project: Add optional LANGUAGES keyword 00007dcc Help: Format project command and variable documentation
| * write_basic_package_version_file: use PROJECT_VERSIONAlex Neundorf2014-01-292-3/+10
| | | | | | | | | | | | | | In the write_basic_package_version_file(), the VERSION argument is now optional. If none is given, it falls back to ${PROJECT_VERSION}. Alex
* | Merge topic 'fix-Qt-autogen'Brad King2014-01-293-74/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f7ae1d8a QtAutogen: Short-circut some logic when moc is not available. 4b989d5f QtAutogen: Separate source file processing from AUTOMOC. c48d877d QtAutogen: Make some methods appropriately file-static. 394e86df QtAutogen: Fix autouic target options in the presence of a config. 964d7f2a QtAutogen: Remove unused variables. 0d934efd QtAutogen: Remove read of SKIP_AUTOUIC target property. 321e348e QtAutogen: Use Qt 4 IMPORTED targets to find executable locations. e96683b0 Qt4: Use IMPORTED executable names with custom commands. e6182f5d Qt4: Create IMPORTED executable targets for all Qt executables.
| * | QtAutogen: Separate source file processing from AUTOMOC.Stephen Kelly2014-01-281-1/+1
| | | | | | | | | | | | This will allow using AUTOUIC without using AUTOMOC for example.
| * | Qt4: Use IMPORTED executable names with custom commands.Stephen Kelly2014-01-281-9/+9
| | | | | | | | | | | | | | | | | | Finding Qt 5 can overwrite the QT_MOC_EXECUTABLE variable with the moc from Qt 5. Use the IMPORTED target with the explicit version in the name to avoid that.
| * | Qt4: Create IMPORTED executable targets for all Qt executables.Stephen Kelly2014-01-281-64/+22
| | | | | | | | | | | | | | | Qt 5 already has similar IMPORTED targets. The versioned namespace will allow de-conflicting the variable names between Qt 4 and Qt 5.
* | | ExternalProject: Add option GIT_SUBMODULESGereon Kremer2014-01-281-6/+9
| |/ |/| | | | | | | This option allows to filter the submodules that are checked out. Add a simple testcase for GIT_SUBMODULES option passing an empty list.
* | Merge topic 'robust-ep-download-verify'Brad King2014-01-271-7/+27
|\ \ | |/ |/| | | | | | | | | | | a432b93b file DOWNLOAD: Display the curl result status when a hash mismatch occurs. 1cb9ef81 file DOWNLOAD: Test non-zero return status. f73f0fb3 file DOWNLOAD: Add test for bad hash. b5e2265f ExternalProject: Reattempt download when verification fails.
| * ExternalProject: Reattempt download when verification fails.Matt McCormick2014-01-151-7/+27
| | | | | | | | | | | | | | | | | | When downloading an URL with ExternalProject, reattempt the download three times if the file hash verification fails. The re-attempt is limited to non-local URL's. The same download CMake script is re-used after removing any file that resulted from the previous download attempt. Up to three re-attempts are performed.
* | Merge topic 'qcc-id'Brad King2014-01-2210-26/+57
|\ \ | | | | | | | | | | | | | | | e00db59d QNX: Introduce QCC compiler id for that QNX platform compiler. d2dea79b CMakeDetermine*Compiler: Fix typo 'lile' => 'like'
| * | QNX: Introduce QCC compiler id for that QNX platform compiler.Stephen Kelly2014-01-226-22/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce policy CMP0047 to control resetting the id for compatibility. De-duplicate content in the QNX platform file by including the GNU one. QNX is a form of GNU platform. Do not clear CMAKE_SHARED_LIBRARY_${lang}_FLAGS variables. They are populated again later by the Compiler/GNU.cmake file anyway. Modify the CMAKE_CXX_COMPILE_OBJECT variable only when the QCC compiler id is in use, and the language is CXX. Use the QNX recommended flag for QCC instead of the gcc compatible -x flag. Populate new module files to handle system includes and depfiles when using the QCC compiler. Remove code which unsets the system include and depfiles related variables. When a GNU driver is used instead of the QCC one, the appropriate flags will be used. These variables were previously cleared for lowest-common-denominator compatibility with both drivers.
| * | CMakeDetermine*Compiler: Fix typo 'lile' => 'like'Stephen Kelly2014-01-224-4/+4
| | |
* | | Merge topic 'osx-host-arch'Brad King2014-01-211-1/+6
|\ \ \ | |/ / |/| | | | | | | | 9d2a0900 OS X: Use 'uname -m' for processor (#14712)
| * | OS X: Use 'uname -m' for processor (#14712)Brad King2014-01-201-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 2412d9bc (Use 'uname -m' for processor on Cygwin, 2010-09-21) it was pointed out that POSIX requires 'uname -m' but not 'uname -p': http://www.opengroup.org/onlinepubs/9699919799/utilities/uname.html On OS X x86_64, 'uname -p' returns i386 while 'uname -m' returns x86_64. Since the latter is the POSIX-compliant option trust its value. However, on OS X ppc, 'uname -m' returns 'Power Macintosh' so add a special-case to convert that to 'powerpc'.
* | | Merge topic 'update-qt4-docs'Brad King2014-01-201-367/+212
|\ \ \ | |/ / |/| | | | | | | | f81e67c6 Help: Update Qt4 documentation.
| * | Help: Update Qt4 documentation.Stephen Kelly2014-01-151-367/+212
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove independent doc listing for Qt4ConfigurationSettings, Qt4Macros and UseQt4. These are implementation details. Recommend the use of IMPORTED targets. Remove references to the UseQt4 file, which is obsolete in light of the IMPORTED targets. Add documentation for automatic tool invocation and options. Remove reference to variables which should not be needed in modern implementations.
* | GNUInstallDirs: Fix CMAKE_INSTALL_LIBDIR on DebianDaniele E. Domenichelli2014-01-151-5/+59
|/ | | | | | | | | | When not installing in /usr (i.e. /usr/local) on Debian/Ubuntu, the multiarch path is not in ldconfig path, and therefore libraries cannot be found, unless the user manually modifies the files in /etc/ld.so.conf.d, in order to include /usr/local/lib/<arch>. This patch fixes this issue by using "lib/<arch>" only if the user is installing the software in /usr, and uses "lib" in all the other cases.
* 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)
generated by cgit v0.12 at 2024-12-29 07:27:54 (GMT)