summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindBZip2-GnuWin32-registry'David Cole2012-06-121-3/+7
|\ | | | | | | | | 7c912af FindBZip2: Search locations in GnuWin32 registry
| * FindBZip2: Search locations in GnuWin32 registryBrad King2012-06-051-3/+7
| | | | | | | | | | | | | | | | The GnuWin32 "bzip2" installer stores in the registry key HKEY_LOCAL_MACHINE\SOFTWARE\GnuWin32\Bzip2 an "InstallPath" value. Use this entry as a search location.
* | Merge topic 'FindPythonLibs-13216'David Cole2012-06-121-2/+8
|\ \ | | | | | | | | | | | | 9d145b0 FindPythonLibs: honor EXACT version specification (#13216)
| * | FindPythonLibs: honor EXACT version specification (#13216)Rolf Eike Beer2012-06-051-2/+8
| | |
* | | Merge topic 'CPackRPM-emptyPerComponentREQUIRES'David Cole2012-06-121-1/+4
|\ \ \ | |_|/ |/| | | | | | | | 7321c94 CPackRPM: avoid leakage of RPM directive from one component to another.
| * | CPackRPM: avoid leakage of RPM directive from one component to another.Eric NOULARD2012-06-051-1/+4
| |/ | | | | | | | | Fixes #0013248 Inspired-By: Sergei Golubchik
* | Merge topic 'Ninja-EXPORT_COMPILE_COMMANDS'David Cole2012-06-051-0/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 3545645 Exclude the CompileCommandOutput test on WIN32. fbaddf4 Escape the source file to be compiled if required. db839be Make the CMAKE_EXPORT_COMPILE_COMMANDS option work with Ninja. 8778357 Add newline to the output. 2c04bc0 Move the EscapeJSON method to a sharable location.
| * | Make the CMAKE_EXPORT_COMPILE_COMMANDS option work with Ninja.Stephen Kelly2012-06-041-0/+6
| |/
* | Merge topic 'moduleLibLzma'David Cole2012-06-051-0/+69
|\ \ | | | | | | | | | | | | ee26019 Add FindLibLZMA Module
| * | Add FindLibLZMA ModuleMario Bensi2012-05-311-0/+69
| |/
* | Merge topic 'fix-13261-allow-variable-overrides'David Cole2012-06-052-6/+12
|\ \ | | | | | | | | | | | | 8b2fb33 Mac: Add guards to CMAKE_FIND_FRAMEWORK and CMAKE_FIND_APPBUNDLE defaults
| * | Mac: Add guards to CMAKE_FIND_FRAMEWORK and CMAKE_FIND_APPBUNDLE defaultsCharlie Sharpsteen2012-05-312-6/+12
| |/ | | | | | | | | | | | | | | The default for `CMAKE_FIND_FRAMEWORK`, defined in `Darwin.cmake` and `Darwin-icc.cmake`, is now guarded so that it will not override command line arguments passed by users. Similarly for `CMAKE_FIND_APPBUNDLE`
* | Merge topic 'qt4-phonon-backend'David Cole2012-06-051-1/+5
|\ \ | | | | | | | | | | | | ad7c80c Added conditional for the phonon backend plugin.
| * | Added conditional for the phonon backend plugin.Kurtis Nusbaum2012-05-291-1/+5
| | | | | | | | | | | | If on APPLE, the phonon backend plugin is set to phonon_qt7. If on WIN32, the phonon backend plugin is set to phonon_ds9. I did not add any for generic UNIXes as they could have a whole host of things. A more comprehensive script would actually attempt to detect which phonon plugins were installed. However, this is a simple fix for now that will work for most people.
* | | Qt4Macros: Added support for generated resource filesTobias Bieniek2012-05-291-16/+24
| |/ |/| | | | | | | | | | | | | | | | | Using the QT4_ADD_RESOURCES() macro required the resource file to exist already for dependency scanning. This prevented the use of resource files that are generated by cmake because it needs the file before resolving the dependency. This patch adds support for generated resource files by not scanning the resource file for dependencies if it doesn't exist yet. The add_custom_command() to generate the resource file should add the dependencies on the files used by the resource file.
* | Merge topic 'HandleEmptySIZEOF_VOID_P'David Cole2012-05-243-0/+15
|\ \ | | | | | | | | | | | | | | | 14b213c add test for #13241: empty SIZEOF_VOIDP in write_basic_package_version_file 00ae36f write_basic_package_version_file() now works with unset CMAKE_SIZEOF_VOID_P
| * | write_basic_package_version_file() now works with unset CMAKE_SIZEOF_VOID_PAlex Neundorf2012-05-233-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | This fixes #13241. If CMAKE_SIZEOF_VOID_P is not set, either in the installed or in the using project, don't check for it. Alex
* | | Merge topic 'FindPythonLibs-doc-cache-vars'David Cole2012-05-241-0/+5
|\ \ \ | | | | | | | | | | | | | | | | c5c9af5 FindPythonLibs: Document cache variables (#13240)
| * | | FindPythonLibs: Document cache variables (#13240)Zack Galbreath2012-05-221-0/+5
| |/ / | | | | | | | | | | | | Add information on how to change which install of Python is found by CMake.
* | | Merge topic 'ExternalProject-Ninja-superbuild'David Cole2012-05-241-2/+6
|\ \ \ | | | | | | | | | | | | | | | | c9097c7 ExternalProject: Fix 'make' builds with Ninja (#13159)
| * | | ExternalProject: Fix 'make' builds with Ninja (#13159)Matt McCormick2012-05-211-2/+6
| |/ / | | | | | | | | | | | | | | | Fix the build command when Ninja is the CMake Generator, but the external project is created for a project that does not use CMake but does use "make".
* | | Merge topic 'MakeDefaultInstallComponentNameConfigurable'David Cole2012-05-241-2/+6
|\ \ \ | |/ / |/| | | | | | | | | | | | | | b71e731 -add docs for ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME} 7ced073 make default install component name configurable b6fba35 -strip trailing whitespace
| * | make default install component name configurableAlex Neundorf2012-05-141-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | Until now an unnamed component was always named "Unspecified". Now this name is taken from the new cmake variable CMAKE_INSTALL_DEFAULT_COMPONENT_NAME, which is initialized to "Unspecified". But it can now be set to something project-specific, per directory Alex
| * | -strip trailing whitespaceAlex Neundorf2012-05-131-2/+2
| | | | | | | | | | | | Alex
* | | Merge topic 'FindwxWidgets-OpenBSD'David Cole2012-05-171-2/+2
|\ \ \ | | | | | | | | | | | | | | | | 16ee197 FindwxWidgets: Do not use -isystem on OpenBSD (#13219)
| * | | FindwxWidgets: Do not use -isystem on OpenBSD (#13219)Anthony J. Bentley2012-05-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Set wxWidgets_INCLUDE_DIRS_NO_SYSTEM on OpenBSD in addition to Apple to prevent UsewxWidgets.cmake from using the include_directories SYSTEM option.
* | | | Merge topic 'FeatureSummaryNicerFormatting'David Cole2012-05-171-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b1d7c4b FeatureSummary.cmake: nicer formatting
| * | | | FeatureSummary.cmake: nicer formattingAlex Neundorf2012-05-131-2/+2
| | |/ / | |/| | | | | | | | | | Alex
* | | | Merge topic 'vs11-arm-generator'David Cole2012-05-172-0/+5
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | 5af93bb VS11: Fix ARM architecture hint typo (#13077) 0fa3d09 VS11: Add ARM architecture generator (#13077)
| * | | VS11: Fix ARM architecture hint typo (#13077)Brad King2012-05-101-1/+1
| | | |
| * | | VS11: Add ARM architecture generator (#13077)Minmin Gong2012-05-092-0/+5
| | | |
* | | | Fix the number variable comparison when Qt is not found.Stephen Kelly2012-05-031-1/+1
| | | |
* | | | Abort FindQt4.cmake if Qt 5 is found.David Faure2012-05-031-4/+16
|/ / /
* | | Merge topic 'module-no-soname'David Cole2012-05-017-13/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | fdb3f87 Test NO_SONAME property (#13155) e1409ac Support building shared libraries or modules without soname (#13155)
| * | | Support building shared libraries or modules without soname (#13155)Modestas Vainius2012-04-307-13/+13
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a boolean target property NO_SONAME which may be used to disable soname for the specified shared library or module even if the platform supports it. This property should be useful for private shared libraries or various plugins which live in private directories and have not been designed to be found or loaded globally. Replace references to <CMAKE_SHARED_LIBRARY_SONAME_${LANG}_FLAG> and hard-coded -install_name flags with a conditional <SONAME_FLAG> which is expanded to the value of the CMAKE_SHARED_LIBRARY_SONAME_${LANG}_FLAG definition as long as soname supports is enabled for the target in question. Keep expanding CMAKE_SHARED_LIBRARY_SONAME_${LANG}_FLAG in rules in case third party projects still use it. Such projects would not yet use NO_SONAME so the adjacent <TARGET_SONAME> will always be expanded. Make <TARGET_INSTALLNAME_DIR> NO_SONAME aware as well. Since -install_name is soname on OS X, this should not be a problem if this variable is expanded only if soname is enabled. The Ninja generator performs rule variable substitution only once globally per rule to put its own placeholders. Final substitution is performed by ninja at build time. Therefore we cannot conditionally replace the soname placeholders on a per-target basis. Rather than omitting $SONAME from rules.ninja, simply do not write its contents for targets which have NO_SONAME. Since 3 variables are affected by NO_SONAME ($SONAME, $SONAME_FLAG, $INSTALLNAME_DIR), set them only if soname is enabled.
* | | Merge topic 'intel-Windows-RTC1'David Cole2012-05-011-1/+1
|\ \ \ | | | | | | | | | | | | | | | | dd08062 Intel: On Windows use /RTC1 instead of deprecated /GZ (#13174)
| * | | Intel: On Windows use /RTC1 instead of deprecated /GZ (#13174)Brad King2012-04-301-1/+1
| | | |
* | | | Merge topic 'fix-12564-avoid-git-re-clones'David Cole2012-05-011-29/+72
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 08db81e ExternalProject: Avoid repeated git clone operations (#12564) d14c024 ExternalProject: Refactor repeated code into function (#12564) 987c017 ExternalProject: Avoid unnecessary git clones (#12564)
| * | | | ExternalProject: Avoid repeated git clone operations (#12564)David Cole2012-04-281-1/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By tracking a stamp file within the git clone script itself. Avoids a 2nd git clone operation after switching from Debug to Release builds in Visual Studio, or vice-versa.
| * | | | ExternalProject: Refactor repeated code into function (#12564)David Cole2012-04-281-27/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add "private/internal-use-only" function _ep_get_step_stampfile to get the name of the stamp file for a given step. The functionality provided by this commit should be identical to its parent commit.
| * | | | ExternalProject: Avoid unnecessary git clones (#12564)David Cole2012-04-251-1/+7
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of git, only track the repository in the repository info dependency tracking file. Not the tag. The download step should only re-run if the repository changes. The download step should NOT re-run if the tag changes. The update step is an 'always' re-running step, and so should already re-run, unless it's been eliminated by use of UPDATE_COMMAND ""
* | | | Merge topic 'more-Intel-warnings'David Cole2012-05-012-2/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | f621ead Check{C,CXX}CompilerFlag: catch more Intel warning types (#12576)
| * | | Check{C,CXX}CompilerFlag: catch more Intel warning types (#12576)Rolf Eike Beer2012-04-262-2/+6
| | |/ | |/| | | | | | | Patch provided by Szilárd Páll.
* | | Merge topic 'intel-Windows-EHsc'David Cole2012-04-251-1/+1
|\ \ \ | | |/ | |/| | | | | | | 4f80896 Intel: On Windows use /EHsc instead of deprecated /GX (#13163)
| * | Intel: On Windows use /EHsc instead of deprecated /GX (#13163)Brad King2012-04-241-1/+1
| |/ | | | | | | | | | | | | | | | | | | Use of the deprecated option with Intel 2011 produces icl: command line remark #10010: option '/GX' is deprecated and will be removed in a future release. See '/help deprecated' so use its replacement option which has been supported for several older versions anyway.
* | Merge topic 'fix-9946-uninstall-before-install'David Cole2012-04-253-0/+34
|\ \ | | | | | | | | | | | | fe58b67 Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL
| * | Added CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALLPatrick Gansterer2012-04-223-0/+34
| |/ | | | | | | If CPACK_NSIS_ENABLE_UNINSTALL_BEFORE_INSTALL is set to ON the NSIS installer will look for a previous installed version and ask the user about uninstall.
* | Merge topic 'fix-ExternalProject-COMMAND-niggly'David Cole2012-04-251-1/+2
|\ \ | | | | | | | | | | | | 64818c1 ExternalProject: Add missing COMMAND keyword
| * | ExternalProject: Add missing COMMAND keywordDavid Cole2012-04-221-1/+2
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit f67139ae added running a verify script in between running the download and extract scripts. Since then, it has always been missing the COMMAND keyword added in this commit. It worked anyway (semi-accidentally) by running a command line like: cmake -P script1.cmake cmake -P script2.cmake CMake, when running -P scripts on the command line, runs them in order, and apparently ignores spurious arguments in between (the middle "cmake" in the above example) and so, all appeared to work as intended. This commit adds the missing keyword and the commands that run are now two separate sequential cmake invocations like: cmake -P script1.cmake cmake -P script2.cmake ...which was the original intent of commit f67139ae
* | Merge topic 'fix-13085-add-nsis-preinstall-hook'David Cole2012-04-252-3/+12
|\ \ | | | | | | | | | | | | aa8acea CPack/NSIS: Add CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS (#13085)
generated by cgit v0.12 at 2025-01-06 23:33:08 (GMT)