summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* FindPythonInterp: make version selectableRolf Eike Beer2012-01-181-2/+39
| | | | | | | | This allows the developer to tell FindPythonInterp which Python version should be searched for. This allows the right version to be chosen for a project without user assistance if there are specific requirements. This is especially useful as it is common to have major versions 2 and 3 installed in parallel, which are partly incompatible.
* Merge topic 'check_symbol_exists'David Cole2012-01-171-1/+1
|\ | | | | | | | | | | | | 6856b4d Merge topic 'link-shared-depend-cycle-issue-12647' into check_symbol_exists 8e1f376 add a test for Check{,CXX}SymbolExists 813eca6 CheckSymbolExists: force the compiler to keep the referenced symbol
| * CheckSymbolExists: force the compiler to keep the referenced symbolRolf Eike Beer2012-01-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Otherwise the compiler may optimize out the reference to the symbol as the previous version was not really using this. This leads to symbols that are only in a header but not in the given libraries to be reported as present. This came up on the first try to fix bug 11333 as "gcc -O3" would optimize out the reference to pthread_create() so the correct library the symbol is in was not detected. The new test code was suggested by Brad King.
* | Merge topic 'FindMPI-issue-12874'David Cole2012-01-171-1/+1
|\ \ | | | | | | | | | | | | 87737e6 FindMPI: Append MPI C++ library correctly in non-compiler case (#12874)
| * | FindMPI: Append MPI C++ library correctly in non-compiler case (#12874)Brad King2012-01-161-1/+1
| |/ | | | | | | | | | | | | | | When we have no MPI compiler wrapper and search explicitly for the MPI C++ library append it correctly to the list of libraries instead of using a space. Suggested-by: Mourad Boufarguine <bouffa@gmail.com>
* | Merge topic 'CPackRPM-noFileListedTwice'David Cole2012-01-171-0/+19
|\ \ | | | | | | | | | | | | ae250d5 CPackRPM flag direcories with %dir in the generated spec file
| * | CPackRPM flag direcories with %dir in the generated spec fileDeborah Pickett2012-01-131-0/+19
| |/ | | | | | | | | | | | | This fix bug #12863 whose symptom was a lot of "warning: File listed twice" printed out by rpmbuild when processing the spec file. Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
* | Merge topic 'ExternalProject-git-cmd-version'David Cole2012-01-171-1/+2
|\ \ | | | | | | | | | | | | | | | 4ac6ba2 ExternalProject: Update copyright year 8cb8ccc ExternalProject: Fix git.cmd version detection
| * | ExternalProject: Update copyright yearBrad King2012-01-101-1/+1
| | |
| * | ExternalProject: Fix git.cmd version detectionBrad King2012-01-101-0/+1
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GIT_EXECUTABLE points at ".../Git/cmd/git.cmd" in an msysGit installation we previously failed to detect the version number in a subtle case. The "git.cmd" assumes 'chcp' is in PATH. It is typically available at "C:\Windows\System32\chcp.com". On 64-bit Windows the File System Redirector maps this location to "C:\Windows\SysWOW64\chcp.com" for 32-bit processes. However, some Windows installations fail to provide chcp.com at this path. Whenever git.cmd runs in a 32-bit command shell, as it does under a 32-bit CMake binary, it reports 'chcp' is not recognized as an internal or external command, operable program or batch file. on stderr. Capture stderr separately so it does not affect parsing of the version number. See also msysGit issue 358: http://code.google.com/p/msysgit/issues/detail?id=358 Note that FindGit prefers "git.cmd" over "git.exe" because it sets up the proper HOME environment variable necessary for Git ssh connections to work the same as they do from the Git bash prompt.
* | Merge topic 'compiler-version'David Cole2012-01-176-8/+224
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0df1942 Detect SGI MIPSpro compiler version with its id a5e892c Document compiler version macro formats used for detection d7c6f41 Detect HP compiler version with its id 3dd9fa9 Detect SunPro compiler version with its id c198730 Detect Watcom compiler version with its id 5899b98 Detect Clang compiler version with its id b8cfa65 Detect PGI compiler version with its id 6dae666 Detect IBM XL compiler version with its id 4080d55 Detect Borland compiler version with its id 2cc205a Detect Intel compiler version with its id (#11937) a6d83cc Detect MSVC compiler version with its id a662855 Detect GNU compiler version with its id (#6251) fa7141f Add framework to detect compiler version with its id (#12408)
| * | Detect SGI MIPSpro compiler version with its idBrad King2012-01-102-0/+22
| | | | | | | | | | | | | | | | | | | | | Decode decimal digits from _SGI_COMPILER_VERSION or _COMPILER_VERSION to compute version number components. See documentation at: http://predef.sourceforge.net/precomp.html
| * | Document compiler version macro formats used for detectionBrad King2012-01-102-0/+28
| | | | | | | | | | | | | | | | | | The MSVC, HP, XL, SunPro, Watcom, Borland, and Intel compilers specify their version number in components encoded in a single integer value. Document the components that we use to compute version numbers.
| * | Detect HP compiler version with its idBrad King2012-01-102-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __HP_cc and __HP_aCC to compute version number components. See documentation at: http://predef.sourceforge.net/precomp.html http://g4u0420c.houston.hp.com/en/14487/preprocess.htm
| * | Detect SunPro compiler version with its idBrad King2012-01-102-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode hex digits from __SUNPRO_C and __SUNPRO_CC to compute the version number components. Note that the constant encodes decimal digits as hex digits (never larger than 9). We represent them as decimal after extraction. See documentation at http://predef.sourceforge.net/precomp.html Although the documented version number format is 0xVRP where V = Version, R = Revision, P = Patch it holds only though SunPro C/C++ version 5.9. Later versions have a two-digit revision (minor) number so their format is 0xVRRP.
| * | Detect Watcom compiler version with its idBrad King2011-12-072-0/+4
| | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __WATCOMC__ to compute the version number components. See documentation at: http://predef.sourceforge.net/precomp.html
| * | Detect Clang compiler version with its idBrad King2011-12-072-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __clang_major__ __clang_minor__ __clang_patchlevel__ to compute version number components. See documentation at: http://clang.llvm.org/docs/LanguageExtensions.html#builtinmacros http://predef.sourceforge.net/precomp.html
| * | Detect PGI compiler version with its idBrad King2011-12-072-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __PGIC__ __PGIC_MINOR__ __PGIC_PATCHLEVEL__ to compute version number components.
| * | Detect IBM XL compiler version with its idBrad King2011-12-072-6/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __IBMC__ and __IBMCPP__ to compute version number components. See documentation at: http://predef.sourceforge.net/precomp.html http://publib.boulder.ibm.com/infocenter/comphelp/v111v131/topic/com.ibm.xlc111.aix.doc/compiler_ref/xlmacros.html http://publib.boulder.ibm.com/infocenter/comphelp/v111v131/topic/com.ibm.xlcpp111.aix.doc/compiler_ref/xlmacros.html
| * | Detect Borland compiler version with its idBrad King2011-12-072-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode hex digits from __BORLANDC__ to compute the version number components. Note that the constant encodes decimal digits as hex digits (never larger than 9). We represent them as decimal after extraction. See documentation at http://predef.sourceforge.net/precomp.html http://docwiki.embarcadero.com/RADStudio/en/Predefined_Macros
| * | Detect Intel compiler version with its id (#11937)Brad King2011-12-072-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __INTEL_COMPILER __INTEL_COMPILER_BUILD_DATE to compute the version number components. See documentation at: http://predef.sourceforge.net/precomp.html http://software.intel.com/sites/products/documentation/hpc/compilerpro/en-us/fortran/lin/compiler_f/bldaps_for/common/bldaps_use_presym.htm
| * | Detect MSVC compiler version with its idBrad King2011-12-072-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from _MSC_VER, _MSC_FULL_VER, and _MSC_BUILD to compute the version number components. See documentation at: http://msdn.microsoft.com/en-us/library/b0084kay.aspx http://predef.sourceforge.net/precomp.html
| * | Detect GNU compiler version with its id (#6251)Brad King2011-12-072-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Decode decimal digits from __GNUC__ __GNUC_MINOR__ __GNUC_PATCHLEVEL__ to compute version components. See documentation at http://gcc.gnu.org/onlinedocs/cpp/Common-Predefined-Macros.html http://predef.sourceforge.net/precomp.html
| * | Add framework to detect compiler version with its id (#12408)Brad King2011-12-076-2/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Teach CMakePlatformId.h to construct an "INFO:compiler_version[]" string literal from macros COMPILER_VERSION_(MAJOR|MINOR|PATCH|TWEAK) to be defined in CMake(C|CXX)CompilerId.(c|cpp) for each compiler. Provide conversion macros DEC() and HEX() to decode decimal or hex digits from integer values. Parse the version out of the compiler id binary along with the other INFO values already present. Store the result in variable CMAKE_<LANG>_COMPILER_VERSION in the format "major[.minor[.patch[.tweak]]]". Save the value persistently in CMake(C|CXX)Compiler.cmake in the build tree. Document the variable for internal use since we do not set it everywhere yet. Report the compiler version on the compiler id result line e.g. The C compiler identification is GNU 4.5.2 Report CMAKE_(C|CXX)_COMPILER_(ID|VERSION) in SystemInformation test.
* | | FindPythonLibs: Search for single-user installs on WindowsChristian Andersson2012-01-101-1/+6
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | When cmake searches for Python libs in Windows it searches in: [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs However, the information might not always reside there. The information could also reside in: [HKEY_CURRENT_USER\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs when one installs Python for a single user and not for all users.
* | Merge topic 'FindRubyFixes'David Cole2012-01-091-3/+7
|\ \ | | | | | | | | | | | | | | | | | | a9bca05 FindRuby.cmake: add more debug output 3db2c8b FindRuby: add more possible library names (for ubuntu, #12172) 93c55ec FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172)
| * | FindRuby.cmake: add more debug outputAlex Neundorf2012-01-051-0/+4
| | | | | | | | | | | | Alex
| * | FindRuby: add more possible library names (for ubuntu, #12172)Alex Neundorf2012-01-051-1/+1
| | | | | | | | | | | | Alex
| * | FindRuby: fix usage of RUBY_VERSION_MAJOR (#12172)Alex Neundorf2012-01-051-2/+2
| | | | | | | | | | | | Alex
* | | Merge topic 'Windows-Intel-Fortran-flags-issue-12642'David Cole2012-01-091-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 35a5838 Intel: Fix Windows per-config Fortran flags (#12642)
| * | | Intel: Fix Windows per-config Fortran flags (#12642)Brad King2012-01-021-3/+3
| |/ / | | | | | | | | | | | | | | | | | | | | | Fix typo introduced in commit 66a08c10 (more uniform approach to enable language, 2004-08-26). The optimization option should be /O2 for Release configurations and /O1 for MinSizeRel. Suggested-by: He Yuqi <yuqi.he@gmail.com>
* | | Merge topic 'GenerateExportHeader-IS_ABSOLUTE-issue-12645'David Cole2012-01-091-1/+1
|\ \ \ | | | | | | | | | | | | | | | | 9f92cdf GenerateExportHeader: Fix wrong use of IS_ABSOLUTE (#12645)
| * | | GenerateExportHeader: Fix wrong use of IS_ABSOLUTE (#12645)Michael Wild2012-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Test content of _GEH_EXPORT_FILE_NAME, not variable name. Signed-off-by: Michael Wild <themiwi@users.sourceforge.net>
* | | | Merge topic 'doxygen-version-12648'David Cole2012-01-091-1/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 85d4d5e FindDoxygen: add DOXYGEN_VERSION variable
| * | | | FindDoxygen: add DOXYGEN_VERSION variableYury G. Kudryashov2012-01-021-1/+6
| | |/ / | |/| | | | | | | | | | | | | | Make it possible to write find_package(DOXYGEN X.Y.Z)
* | | | Merge topic 'CheckCCompilerFlag-issue-12633'David Cole2012-01-091-3/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 646cf91 CheckCCompilerFlag: Generalize "but not for C" case (#12633)
| * | | | CheckCCompilerFlag: Generalize "but not for C" case (#12633)Brad King2011-12-221-3/+2
| | |/ / | |/| | | | | | | | | | | | | | The "warning: " part is not necessary. The case can happen on any GNU compiler, not just an Apple version.
* | | | Merge topic 'FindwxWidgets-webview-issue-12636'David Cole2012-01-091-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | d071148 FindwxWidgets: Add webview library (#12636)
| * | | | FindwxWidgets: Add webview library (#12636)Jason Erb2011-12-221-1/+1
| |/ / / | | | | | | | | | | | | Update for wxWidgets 2.9.3 to include webview component.
* | | | Merge topic 'topics/FindCUDA/Find-new-libraries-upto-4.1'David Cole2012-01-091-1/+30
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 154f537 Added support for curand, cusparse, npp, nvcuenc and nvcuvid libraries.
| * | | | Added support for curand, cusparse, npp, nvcuenc and nvcuvid libraries.James Bigler2011-12-201-1/+30
| | |/ / | |/| | | | | | | | | | | | | | | | | | This addresses Bug 11882 which provided a sample implementation for adding support for cusparse. I went ahead and added all the libraries I thought appropriate.
* | | | Merge topic 'GNUInstallDirs-DebianMultiarch'David Cole2012-01-091-12/+18
|\ \ \ \ | |/ / / |/| | | | | | | | | | | 43f83d2 GNUInstallDirs: add support for Debian multiarch
| * | | GNUInstallDirs: add support for Debian multiarchAlex Neundorf2011-12-141-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes CMAKE_INSTALL_LIBDIR default to the debian multiarch dir if present, e.g. lib/i386-linux-gnu/ Alex
* | | | Merge topic 'fix-12273-quote-arg-in-findboost'David Cole2011-12-201-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | cdf5224 FindBoost: Quote possibly empty string argument (#12273)
| * | | | FindBoost: Quote possibly empty string argument (#12273)David Cole2011-12-191-1/+1
| | |/ / | |/| | | | | | | | | | Author: Claudio Bley
* | | | Merge topic 'qt4-deploy-module'David Cole2011-12-201-9/+13
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 3aa5432 Improve component support and output indentation.
| * | | | Improve component support and output indentation.Mike McQuaid2011-12-161-9/+13
| | | | |
* | | | | Merge topic 'AutomocFineTuning'David Cole2011-12-201-1/+1
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | | | | | | e474dcb automoc: improved warning message in relaxed mode 96fc5d5 automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODE
| * | | | automoc: default to strict mode, use CMAKE_AUTOMOC_RELAXED_MODEAlex Neundorf2011-12-131-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automoc now defaults to strict mode, also with Qt4, i.e. it behaves as the documentation says by default. I also inverted the switch CMAKE_AUTOMOC_STRICT_MODE to CMAKE_AUTOMOC_RELAXED_MODE. Docs and test adapted accordingly. Alex
* | | | Merge topic 'GNU-to-MS'David Cole2011-12-161-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | c213eb9 Windows-GNU: Remove extra quotes in GNUtoMS rule variable