summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* 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)
| * | CPack/NSIS: Add CPACK_NSIS_EXTRA_PREINSTALL_COMMANDS (#13085)David Cole2012-04-212-3/+12
| |/ | | | | | | | | | | | | | | | | | | Allows custom NSIS commands to run prior to any installation actions. Projects that need to run an uninstaller first, especially one from a non-NSIS previous revision of a project that is NOW using CPack and NSIS, may do so by putting custom NSIS commands into this variable. Inspired-by: David Golub
* | Merge topic 'CPack-fixManPage-typo'David Cole2012-04-251-0/+1
|\ \ | | | | | | | | | | | | 94b24ad Fix CPack RPM man page typo detected by lintian.
| * | Fix CPack RPM man page typo detected by lintian.Modestas Vainius2012-04-201-0/+1
| |/ | | | | | | Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | Merge topic 'fix-usejava-typo-13135'David Cole2012-04-251-1/+1
|\ \ | | | | | | | | | | | | 8bdd449 UseJava: fix typo in variable name (#13135)
| * | UseJava: fix typo in variable name (#13135)Rolf Eike Beer2012-04-161-1/+1
| |/ | | | | | | | | | | | | | | As Dave Abrahams pointed out CMAKE_CURRENT_SOURCE_PATH is wrong, it's of course CMAKE_CURRENT_SOURCE_DIR. Also wrap the path in quotes so the example would even work if the source path has spaces.
* | Merge topic 'fix-pkgconfig-13125'David Cole2012-04-251-2/+6
|\ \ | | | | | | | | | | | | 3ea850a FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)
| * | FindPkgConfig.cmake: fix documented output variable not set (#13125,#13132)Rolf Eike Beer2012-04-151-2/+6
| |/ | | | | | | | | The real fix is from Yury G. Kudryashov while I added the surrounding cleanups. An additional hint to really get this fixed came from Rex Dieter.
* | Merge topic 'dev/fix-python3-findmodule'David Cole2012-04-251-4/+11
|\ \ | |/ |/| | | | | | | 4bdec58 Search for other ABIFLAGS builds of Python 6a46f5c Don't put legacy variables back into the cache
| * Search for other ABIFLAGS builds of PythonBen Boeckel2012-03-271-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Starting with Python3, standard Python installs may have additional ABI flags attached to include directories and library names. As of 3.2, the following flags are in the configure file: d -> --with-debug m -> --with-pymalloc u -> --with-wide-unicode Python 3.3 seems to no longer have --with-wide-unicode. Hopefully Python will ensure that the possible flags always show up in a stable order. The 'd' flag is ignored since the debug library is considered separate. There is still the problem where ABI flags cannot be specified in find_package since the letters confuse the version comparator.
| * Don't put legacy variables back into the cacheBen Boeckel2012-03-271-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If PYTHON_INCLUDE_PATH is put into the cache, then it will always override whatever might be found and PYTHON_INCLUDE_DIR is never given a chance to find something different. It being marked as INTERNAL also means that it cannot be changed without editing CMakeCache.txt directly. Basically, the scenario is that if the Python version is changed, then deleting PYTHON_INCLUDE_DIR doesn't work because any cached PYTHON_INCLUDE_PATH variable is set before find_path is even called. Any build tree using a previous version will still need either manual removal of PYTHON_INCLUDE_PATH or a complete reconfigure, but in the future changing the Python version can be accomplished by deleting PYTHON_INCLUDE_DIR and reconfiguring with the new version.
* | Merge topic 'check_include_files_output'David Cole2012-04-101-4/+14
|\ \ | | | | | | | | | | | | 5adb6b7 CheckIncludeFiles: Shorten check description message
| * | CheckIncludeFiles: Shorten check description messageBrad King2012-04-091-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit 44d007b6 (CheckIncludeFiles: fix status output, 2012-02-01) check_include_files reports the list of files tested instead of the name of the variable storing the result. Some projects incrementally test and concatenate very long lists leading to long messages that do not provide much information. Users report confusion especially when the lines wrap. For lists of more than two files produce messages of the format Looing for N include files first.h, ..., last.h where N is the list length and "..." is literal. Leave the log file entries and cache entry description unchanged as they should have the full detail of the check performed.
* | | Merge topic 'new-boost-versions'David Cole2012-04-101-2/+3
|\ \ \ | | | | | | | | | | | | | | | | 63d4960 FindBoost: add support for 1.49 and 1.50
| * | | FindBoost: add support for 1.49 and 1.50Rolf Eike Beer2012-04-071-2/+3
| | | | | | | | | | | | | | | | | | | | Boost 1.49 has already be released. Add this and the next to come version number to the search list.
* | | | Merge topic 'osx-search-paths'David Cole2012-04-101-3/+17
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6190415 OS X: Mark find_program results as advanced d9edf46 OS X: Use correct extra path when searching for applicaton bundles (#13066) 98b9a7f OS X: Use OSX_DEVELOPER_ROOT for app search path (#13066)
| * | | | OS X: Mark find_program results as advancedDavid Cole2012-04-061-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Avoid cluttering the gui with variables nearly nobody needs to see.
| * | | | OS X: Use correct extra path when searching for applicaton bundles (#13066)David Cole2012-04-061-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The parent commit added a search path relative to OSX_DEVELOPER_ROOT. But with Xcode 4.3 the nested Applications folder is in a different relative location compared to that root. This commit makes the intent of the previous commit work with older and newer Xcode directory layouts. Furthermore, it only adds paths that exist to the search path.
| * | | | OS X: Use OSX_DEVELOPER_ROOT for app search path (#13066)Kashif Rasul2012-03-261-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Since commit 4693cf84 (Xcode: Detect new default locations of Xcode 4.3 bits and pieces) Darwin.cmake detects the developer application directory instead of hard-coding /Developer. Replace the hard-coded path in CMAKE_SYSTEM_APPBUNDLE_PATH using the computed result.
* | | | Merge topic 'CPackNSIS-smallDocTypoFix'David Cole2012-04-101-3/+10
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | fcf265f CPackNSIS: Rewrite variable documentation to make it more readable. 8fe0da5 Fix some doc typo and add an undocumented var.
| * | | CPackNSIS: Rewrite variable documentation to make it more readable.David Cole2012-04-051-2/+4
| | | | | | | | | | | | | | | | And avoid parsing problems at the first "."
| * | | Fix some doc typo and add an undocumented var.Eric NOULARD2012-03-271-3/+8
| |/ /
* | | Merge topic 'dev/granular-test-targets-ninja'David Cole2012-04-031-2/+2
|\ \ \ | | | | | | | | | | | | | | | | d5318e0 Create granular targets for Ninja generators too
| * | | Create granular targets for Ninja generators tooBen Boeckel2012-03-291-2/+2
| |/ /
* | | Merge topic 'CPackPM-fixAmazonLinux'David Cole2012-04-031-0/+1
|\ \ \ | | | | | | | | | | | | | | | | 3a0c60d Override topdir from rpm command line seems necessary on Amazon linux.
| * | | Override topdir from rpm command line seems necessary on Amazon linux.Tom Hughes2012-03-271-0/+1
| |/ / | | | | | | | | | | | | This modification should be harmless on other distro. Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | | Merge topic 'AutomocProperCMakeEscaping_13018'David Cole2012-03-271-7/+7
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 9b32475 automoc: add define to test which caused bug #13018 2066511 automoc: fix #13018, proper cmake escaping to avoid false rebuilds c652812 make cmLocalGenerator::EscapeForCMake() static
| * | | automoc: fix #13018, proper cmake escaping to avoid false rebuildsAlex Neundorf2012-03-261-7/+7
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | The variables stored in the AutomocInfo.cmake file were not properly escaped, so when reading them back they could turn into lists, if they contained double quotes initially. This patch fixes this by using cmLocalGenerator::EscapeForCMake() to escape the variables properly. Alex
* | | Merge topic 'ninja-generator'David Cole2012-03-271-1/+4
|\ \ \ | |/ / |/| | | | | | | | 6b5614f Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flags
| * | Ninja: Substitute <OBJECT> and <CMAKE_C_COMPILER> in depfile flagsPeter Collingbourne2012-03-261-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | Patch by Amine Khaldi! Also, start using the -MT flag to set a target name for depfiles. This works around a bug observed in distcc, as explained in the comment. Based on a patch by Alexander Usov.
* | | Merge topic 'MinorFixForEcos'David Cole2012-03-211-1/+8
|\ \ \ | | | | | | | | | | | | | | | | 1ab4b3e guard eCos.cmake against multiple inclusion (#12987)
| * | | guard eCos.cmake against multiple inclusion (#12987)Alex Neundorf2012-03-201-1/+8
| | | | | | | | | | | | | | | | Alex
* | | | Merge topic 'UseRealPathWhenFindingEclipse'David Cole2012-03-211-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 00af40b Eclipse: fix #13036, make version detection work with symlinks
| * | | | Eclipse: fix #13036, make version detection work with symlinksAlex Neundorf2012-03-201-1/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | This patch uses get_filename_component(REALPATH) so symlinks in the path to Eclipse are resolved, which makes the version detection work in such cases. Alex
* | | | Merge topic 'findmpi_look_in_implicit_dirs'David Cole2012-03-211-0/+14
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 2f9ad7c Fix FindMPI for the intel compiler on linux by looking in implict directories.
| * | | | Fix FindMPI for the intel compiler on linux by looking in implict directories.Bill Hoffman2012-03-201-0/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | Use the CMAKE_<LANG>_IMPLICIT_LINK_DIRECTORIES to look for libraries that are in the -showme output from mpi<lang> programs. This is because some libraries reported by -showme are found there, and FindMPI will fail if they are not found.
* | | | Merge topic 'ImprovedCOMPONENTSSupportInFindPackage2'David Cole2012-03-213-15/+95
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 6d100f9 find_package: Test rejection of required+optional components d81d83c add macro check_required_components() to configure_package_config_file() b15c0b4 FPHSA(): add HANDLE_COMPONENTS option 34108cd find_package: add documentation for OPTIONAL_COMPONENTS cdabde8 FPHSA(): add missing "]" to documentation f2e0a18 find_package: add OPTIONAL_COMPONENTS keyword
| * | | add macro check_required_components() to configure_package_config_file()Alex Neundorf2012-03-191-4/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As discussed on cmake-developers, this patch adds a macro check_required_components() to the file configured via configure_package_config_file(), so for proper handling of components in Config.cmake files users can simply call check_required_components(PackageName) and this will do the right thing. Alex
| * | | FPHSA(): add HANDLE_COMPONENTS optionAlex Neundorf2012-03-191-2/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if the HANDLE_COMPONENTS is used, FPHSA() now also checks all required COMPONENTS, i.e. all elements from <name>_FIND_COMPONENTS for which <name>_FIND_REQUIRED_<comp> is true, and sets <name>_FOUND only to true if all have been found. As discussed on cmake-developers. Alex
| * | | find_package: add documentation for OPTIONAL_COMPONENTSAlex Neundorf2012-03-191-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch adds documentation for OPTIONAL_COMPONENTS to cmFindPackage.cxx, and also extends Modules/readme.txt significantly with regard to how components should be handled. Alex
| * | | FPHSA(): add missing "]" to documentationAlex Neundorf2012-03-191-1/+1
| | | | | | | | | | | | | | | | Alex
* | | | Merge topic 'fix-12621-xcode43'Brad King2012-03-191-13/+20
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | 0f4dfa6 CPack: Use real path to PackageMaker to find its version file (#12621) 4693cf8 Xcode: Detect new default locations of Xcode 4.3 bits and pieces (#12621)
| * | | Xcode: Detect new default locations of Xcode 4.3 bits and pieces (#12621)David Cole2012-03-091-13/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Xcode 4.3 installs into "/Applications" by default, from the Mac App Store. Also, the paths to the available SDKs changed: they are now within the Xcode.app bundle. PackageMaker is installed as a separate program, and may be installed anywhere. It is not installed with Xcode 4.3 by default anymore. Download the "Auxiliary Tools for Xcode" to get PackageMaker. Put PackageMaker inside the Xcode.app bundle, in its nested Applications folder, or put it alongside Xcode in "/Applications" and CMake will find it. Update references to "find" paths: add new possible locations for finding Xcode.app and PackageMaker.app. Prefer the most recent version's locations first, but keep the old locations as fallback search paths, too. Thanks to all the contributors who provided and tested out various patches for fixing this issue. Especially, but by no means limited to: Francisco Requena Espí, Jamie Kirkpatrick and drfrogsplat.
generated by cgit v0.12 at 2024-11-01 00:23:48 (GMT)