summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'improve-findgit'David Cole2012-01-251-1/+16
|\ | | | | | | | | a803a62 FindGit: support version number
| * FindGit: support version numberRolf Eike Beer2012-01-231-1/+16
| |
* | Merge topic 'improve-findgnutls'David Cole2012-01-251-1/+4
|\ \ | | | | | | | | | | | | b5719fb FindGnuTLS: partly support version selection
| * | FindGnuTLS: partly support version selectionRolf Eike Beer2012-01-231-1/+4
| |/ | | | | | | | | For the Un*x systems where we use PkgConfig to find the library we can also use the version returned from there.
* | Merge topic 'improve-libxml2'David Cole2012-01-251-2/+8
|\ \ | | | | | | | | | | | | a5fd391 FindLibXml2: support version selection
| * | FindLibXml2: support version selectionRolf Eike Beer2012-01-231-2/+8
| |/
* | Merge topic 'use-pkgconfig-quiet'David Cole2012-01-254-9/+7
|\ \ | | | | | | | | | | | | ede3ec5 use pkg_check_modules() quiet in other modules
| * | use pkg_check_modules() quiet in other modulesRolf Eike Beer2012-01-234-9/+7
| |/ | | | | | | | | Those modules will already print what they found or not using FPHSA, no need to do this twice.
* | Merge topic 'find-threads-11333'David Cole2012-01-251-19/+28
|\ \ | | | | | | | | | | | | 3dc6f2b FindThreads: Try pthreads with no special option first (#11333)
| * | FindThreads: Try pthreads with no special option first (#11333)Rolf Eike Beer2012-01-211-19/+28
| |/ | | | | | | | | | | | | QNX has the phtread stuff in the standard library. The best way would IMHO be to check if a program that uses pthread_* can be successfully linked without specifying any linker option before trying out the different flags.
* | Merge topic 'GetPrerequisites-rpath-OSX'David Cole2012-01-251-0/+29
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 98d2031 Fix BundleUtilities test failure with space in build path. 36d6641 Fix new BundleUtilities test failure on Mac 10.4.x 0d96dec GetPrerequisites: Add test for @rpath support. 880139a GetPrerequisites: Add support for @rpath on Mac OS X. 9a6b102 GetPrerequisites: Add support for @rpath on Mac OS X.
| * | GetPrerequisites: Add support for @rpath on Mac OS X.Clinton Stimpson2012-01-201-6/+11
| | | | | | | | | | | | | | | | | | Change to consider a library embedded if it is found in a subdirectory relative to the using executable/library. Previous commit considered them local. This case is encountered when @rpath is used with framework libraries, which are inside a directory tree.
| * | GetPrerequisites: Add support for @rpath on Mac OS X.Clinton Stimpson2011-11-211-3/+27
| | | | | | | | | | | | | | | | | | | | | | | | Handle @rpath much like other Unixes, by doing a find_file with the given directories. Also, consider a library to be local if it is found in the same directory or a subdirectory relative to the user executable/library. Previously, it was local only if found in the same directory. This case is encountered when @rpath is used with framework libraries, which are inside a directory tree.
* | | Merge topic 'FPHSA-CONFIG_MODE-doc'David Cole2012-01-251-3/+3
|\ \ \ | | | | | | | | | | | | | | | | 26015ba FindPackageHandleStandardArgs: fix documentation
| * | | FindPackageHandleStandardArgs: fix documentationYury G. Kudryashov2012-01-201-3/+3
| | |/ | |/| | | | | | | State explicitly what CONFIG_MODE argument does.
* | | Merge topic 'FindPkgConfig-REQUIRED-issue-12620'David Cole2012-01-251-4/+2
|\ \ \ | | | | | | | | | | | | | | | | 55c3435 FindPkgConfig: respect REQUIRED (#12620)
| * | | FindPkgConfig: respect REQUIRED (#12620)Yury G. Kudryashov2012-01-201-4/+2
| |/ / | | | | | | | | | find_package(PkgConfig REQUIRED) now fails if pkg-config is not found.
* | | Merge topic 'python-version'David Cole2012-01-251-7/+48
|\ \ \ | | | | | | | | | | | | | | | | | | | | aa11536 FindPythonInterp: fix version parsing 0fe4d69 FindPythonInterp: make version selectable
| * | | FindPythonInterp: fix version parsingRolf Eike Beer2012-01-191-5/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On dashmacmini2 the test showed output like this: -- Found PythonInterp: /usr/bin/python (found version "Unknown option: -- usage: /usr/bin/python [option] ... [-c cmd | file | -] [arg] ... Try `python -h' for more information.") On my machine where python outputs "Python 2.7" this worked, but PYTHON_VERSION_MAJOR, PYTHON_VERSION_MINOR, and PYTHON_VERSION_PATCH were all set to "2.7". Add some checks that the version output has the expected form before using it.
| * | | 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 'openssl-version'David Cole2012-01-251-8/+32
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | bb2b264 FindOpenSSL: also parse version number define with uppercase letters 7053a00 FindOpenSSL: only try to parse opensslv.h if it exists 44ba7a3 Merge branch 'master' of git://cmake.org/cmake into openssl-version 8e8672c FindOpenSSL: improve version number handling
| * | | FindOpenSSL: also parse version number define with uppercase lettersRolf Eike Beer2012-01-171-2/+2
| | | |
| * | | FindOpenSSL: only try to parse opensslv.h if it existsRolf Eike Beer2012-01-171-1/+1
| | | |
| * | | FindOpenSSL: improve version number handlingRolf Eike Beer2012-01-131-8/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | First this fixes the bug that e.g. version "1.0.0" was shown as "1..". When pkg-config was used to find OpenSSL the header file was parsed for the version number even if pkg-config returned it already. Finally we also include the patch level (i.e. the letter after the version number) in OPENSSL_VERSION.
* | | | Merge topic 'FindProtobuf_import_dirs'David Cole2012-01-251-0/+13
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | | | | | 27bc9e2 FindProtobuf: Update documentation comment for 2.8.8 84079c9 FindProtobuf: Merge patch that allows extra import dirs
| * | | FindProtobuf: Update documentation comment for 2.8.8Philip Lowman2012-01-041-1/+1
| | | |
| * | | FindProtobuf: Merge patch that allows extra import dirsPhilip Lowman2011-12-181-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for additional import paths during protoc invocation time to the PROTOBUF_GENERATE_CPP public macro via a new PROTOBUF_IMPORT_DIRS optional variable. Patch courtesy of Miroslav Kes <mkes@ra.rockwell.com>
* | | | 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.