summaryrefslogtreecommitdiff
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'getprerequisites-endless-path-appending'David Cole2010-10-281-10/+41
|\ | | | | | | | | | | | | | | | | 48e80eb Fixes to GetPrerequisites for cygwin bee4802 Append the gp_tool path to the system PATH using native slashes. 8e550ba Remove unecessary TO_CMAKE_PATH for gp_cmd_dir. 1684198 Switch to CMAKE_PATH when doing PATH comparisons on Windows. be94c49 Fixed appending PATH to dumpbin tool from growing without bounds.
| * Fixes to GetPrerequisites for cygwinDavid Partyka2010-10-271-8/+28
| | | | | | | | Fix IF(WIN32) guards check for cygwin. Fix checking if the depenency is in a system location to use cygwin style paths on cygwin. Also change GetPrerequisites to switch gp_tool to tools that are very unlikely to be found, ie. dumpbin on Apple and otool on Windows/Unix.
| * Append the gp_tool path to the system PATH using native slashes.David Partyka2010-10-261-0/+1
| |
| * Remove unecessary TO_CMAKE_PATH for gp_cmd_dir.David Partyka2010-10-261-1/+0
| | | | | | | | It is already using CMAKE style paths.
| * Switch to CMAKE_PATH when doing PATH comparisons on Windows.David Partyka2010-10-261-2/+5
| | | | | | | | | | | | | | | | Users PATH may contain elements that end with backslash. This will escape the semicolon when iterating resulting in mismatches. Fix indentation. Fix whitespace
| * Fixed appending PATH to dumpbin tool from growing without bounds.David Partyka2010-10-251-2/+10
| | | | | | | | IF(... MATCHES ...) used for comparing directories chokes especially in the case of C:\Program Files (x86)\<blah> because of regex pattern matching. Switched this to use STREQUAL in a loop instead.
* | Merge topic 'CPackDeb-MoreControl'David Cole2010-10-281-1/+37
|\ \ | | | | | | | | | | | | a749724 CPackDeb Added several optional debian binary package fields
| * | CPackDeb Added several optional debian binary package fieldsEric NOULARD2010-10-251-1/+37
| |/ | | | | | | | | | | This fixes bugs #0011355 and 0008342. The merged patch is a contribution from Michael Lasmanis and Petri Hodju with some extra documentation added by the merger.
* | Merge topic 'fix-11173'David Cole2010-10-281-2/+16
|\ \ | | | | | | | | | | | | 6e1282f ExternalProject: No svn --username if empty (#11173)
| * | ExternalProject: No svn --username if empty (#11173)David Cole2010-10-221-2/+16
| |/ | | | | | | Nor --password. But please do if non-empty. Thank you.
* | Merge topic 'external-project-extra-gen'David Cole2010-10-281-2/+1
|\ \ | | | | | | | | | | | | beeca11 Fixed parallel build for generators with EXTRA.
| * | Fixed parallel build for generators with EXTRA.Marcus D. Hanwell2010-10-221-2/+1
| | | | | | | | | | | | | | | | | | Fixed parallel build for projects using generators that have the CMAKE_EXTRA_GENERATOR as well as CMAKE_GENERATOR. Thanks to Bill Hoffman for helping me to track this one down, I missed parallel builds.
* | | Merge topic 'PythonLibs-2.7'David Cole2010-10-281-1/+1
|\ \ \ | |_|/ |/| | | | | | | | 1f369a7 ENH: Added case for Python 2.7.
| * | ENH: Added case for Python 2.7.Marcus D. Hanwell2010-10-191-1/+1
| | |
* | | Merge topic 'AddCMAKE_CURRENT_LIST_DIR'David Cole2010-10-1986-86/+86
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | b011840 Use absolute path to FindPackageHandleStandardArgs.cmake everywhere 41e4f1a Add automatic variable CMAKE_CURRENT_LIST_DIR(dir of CMAKE_CURRENT_LIST_FILE) f9fc79c Remove trailing whitespace
| * | | Use absolute path to FindPackageHandleStandardArgs.cmake everywhereAlex Neundorf2010-09-2886-86/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to avoid getting an (older) copy of FPHSA.cmake which is e.g. installed with KDE 4.5.0 and 4.5.1. Alex
* | | | Merge topic 'FindBoost_bugfix_cleanup'David Cole2010-10-121-17/+8
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | b867a3f Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.
| * | | | Remove superfluous variable Boost_COMPAT_STATIC_RUNTIME.Philip Lowman2010-10-111-17/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to introduce this extra variable as FindBoost can simply rely on if Boost_USE_STATIC_RUNTIME is defined or not to disable the old searching behavior for static runtime libraries on WIN32.
* | | | | Merge topic 'FindHDF5-is-parallel'David Cole2010-10-121-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 3445532 FindHDF5: Fix typo in parallel-IO support check (#11291)
| * | | | | FindHDF5: Fix typo in parallel-IO support check (#11291)Brad King2010-10-111-1/+1
| |/ / / /
* | | | | Merge topic 'findmpi-msmpi-update'David Cole2010-10-121-1/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 35d2770 Update module to locate newely released MS MPI HPC Pack R2.
| * | | | | Update module to locate newely released MS MPI HPC Pack R2.David Partyka2010-10-111-1/+2
| |/ / / /
* | | | | Merge topic 'qt4-imports-dir'David Cole2010-10-121-37/+36
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 2dae2f1 Find imports dir in Qt 4.7
| * | | | | Find imports dir in Qt 4.7Clinton Stimpson2010-10-081-37/+36
| |/ / / /
* | | | | FindSubversion: Use C locale to detect version (#11273)Rolf Eike Beer2010-10-071-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Force LC_ALL to C before the call of the svn executable as it is done in the Subversion_WC_INFO macro a few lines below.
* | | | | FindSubversion: Fix for German localized client (#11273)Rolf Eike Beer2010-10-071-1/+1
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On a Win32 system with a German version of SilkSVN I couldn't run CMake again on the working copy as the cache is displayed as corrupted. The cause is that the regular expression to find the version number will not match and put everything from the "svn --version" output into the cache, which contains umlauts and other funny characters. Fix the regexp to not only match " version " but also " Version " as it's in the German output. I have no idea what will happen on a French or Japanese system. This should be easy to test as it happens also on a German Linux system.
* | | | Merge topic 'FindCUDA-allow-g3'Brad King2010-10-051-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 6916f8d Allow -g3 for CUDA v3.0+.
| * | | | Allow -g3 for CUDA v3.0+.James Bigler2010-10-041-2/+2
| |/ / / | | | | | | | | | | | | | | | | In versions of the CUDA toolkit previous to version 3.0 the use of -g3 would cause compilation errors. This was fixed in version 3.0.
* | | | Merge topic 'Fix-0011263-CUDA_SDK_PATH'Brad King2010-10-051-1/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 1df8516 Fix for bug 0011263.
| * | | | Fix for bug 0011263.James Bigler2010-10-041-1/+3
| |/ / / | | | | | | | | | | | | Added CUSDKCOMPUTE_ROOT to the list of paths when looking for CUDA_SDK_ROOT_DIR.
* | | | Merge topic 'CPackHandleParenthesisInSystemName'Brad King2010-10-051-3/+3
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4a4a53f CPackRPM Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)
| * | | | CPackRPM Handle parenthesis in CPACK_SYSTEM_NAME (fix bug 10737)Eric NOULARD2010-10-031-3/+3
| |/ / / | | | | | | | | | | | | merge patch from Frank Stappers
* | | | Merge topic '11279'Brad King2010-10-051-2/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | aca758b Fixes issue 11279: CMakeDetermineVSServicePack support for VS10
| * | | | Fixes issue 11279: CMakeDetermineVSServicePack support for VS10Philip Lowman2010-09-301-2/+4
| |/ / / | | | | | | | | | | | | Thanks to Aaron C. Meadows for the patch.
* | | | Merge topic 'vs-load-Windows-ifort'Brad King2010-10-053-0/+6
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 20f4973 Reset platform/compiler info status for each language
| * | | Reset platform/compiler info status for each languageBrad King2010-09-283-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In each CMake<lang>Information.cmake file we use an _INCLUDED_FILE variable to track whether a compiler information file has been loaded. Reset this variable for each language. This fixes Fortran under VS generators with the Intel plugin. Previously the variable would be left set true from C and C++ and then Fortran would not load old-style files like Platform/Windows-ifort.
* | | | Merge topic 'PutRequiredVersionInDetailMessageInFPHSA'Brad King2010-09-281-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 567ac0b Also store the required version number in the details message.
| * | | | Also store the required version number in the details message.Alex Neundorf2010-09-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way the success/failure message of FPHSA() is also printed again if the required version is changed. Alex
* | | | | Merge topic 'python_module_prefix_suffix'Brad King2010-09-281-0/+7
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | d36c16a Set the module prefix, updated Windows suffix.
| * | | | Set the module prefix, updated Windows suffix.David Gobbi2010-09-241-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | Set the Python module prefix to PYTHON_MODULE_PREFIX, and changed the suffix on Windows to .pyd as .dll is officially deprecated.
* | | | | Merge topic 'findqt4-cross-compile'Brad King2010-09-281-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 25931ae Fix regression in cross-compile patches with finding Qt libs.
| * | | | | Fix regression in cross-compile patches with finding Qt libs.Clinton Stimpson2010-09-231-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a Qt installation is in CMAKE_PREFIX_PATH and a QT_QMAKE_EXECUTABLE points to a qmake for a different Qt installation, prefer finding libs in the latter Qt installation.
* | | | | | Merge topic 'DescriptionsForFeatureSummaryALL'Brad King2010-09-281-5/+9
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | b935f00 Close ENDFUNCTION() properly with the same name as FUNCTION() 07bca48 Set a default DESCRIPTION if none is given for ALL mode of feature_summary() d5b2915 APPEND and not-APPEND mode of feature_summary() were swapped
| * | | | | Close ENDFUNCTION() properly with the same name as FUNCTION()Alex Neundorf2010-09-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | Set a default DESCRIPTION if none is given for ALL mode of feature_summary()Alex Neundorf2010-09-211-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | Alex
| * | | | | APPEND and not-APPEND mode of feature_summary() were swappedAlex Neundorf2010-09-211-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Alex
* | | | | | Merge topic 'fix-11026'Brad King2010-09-221-2/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4a323bd Honor MAKECOMMAND value saved in cache (#11026)
| * | | | | | Honor MAKECOMMAND value saved in cache (#11026)David Cole2010-09-211-2/+4
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a separate variable to pass to the BUILD_COMMAND call and then use set(CACHE) to transfer that to MAKECOMMAND. That way, if MAKECOMMAND is in the cache already, it is left untouched. Fixes regression introduced in commit 0b38bb4c with the fix for bug #2336. Thanks to Evgeniy P for the patch.
* | | | | | Merge topic 'mingw-long-object-lists'Brad King2010-09-222-2/+34
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 5f05a3c MinGW: Support long object file lists 2d9bb33 Evaluate <OBJECT_DIR> rule variable for executables
| * | | | | | MinGW: Support long object file listsBrad King2010-09-172-2/+34
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a combination of response files and the archiver to support long object file lists that do not fit in the Windows command-line length limit. This can work only with GCC >= 4 because the MinGW GCC 3.x front-ends do not support response-file syntax.