summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'fix-msvc-linker-flags-typo' into release-3.1Brad King2015-02-032-2/+2
|\
| * MSVC: Fix initialization of RelWithDebInfo shared library link flags (#15385)Brad King2015-02-032-2/+2
| | | | | | | | | | | | | | | | | | | | Initialize CMAKE_SHARED_LINKER_FLAGS_RELWITHDEBINFO_INIT from the value of CMAKE_EXE_LINKER_FLAGS_RELWITHDEBINFO_INIT rather than the one for the DEBUG configuration. This typo has been present since the logic was first added in commit 36db45082e (ENH: fix up several problems with new stuff, 2002-11-11). Reported-by: Gunnar Roth <gunnar.roth@gmx.de>
* | Merge branch 'OpenSSL_102' into releaseBrad King2015-01-281-1/+1
|\ \
| * | FindOpenSSL: fix detection of OpenSSL 1.0.2Guillaume Belz2015-01-271-1/+1
| |/
* | FeatureSummary: Fix bracket in documentation.Christoph Grüninger2015-01-231-2/+2
|/
* Merge branch 'FindQt-fixes' into releaseBrad King2015-01-161-3/+10
|\
| * FindQt: explicitely mention that it cannot Qt5 or laterRolf Eike Beer2015-01-161-0/+3
| |
| * FindQt: fix variable name in error messageRolf Eike Beer2015-01-161-2/+2
| |
| * FindQt: fix setting DESIRED_QT_VERSION if "find_package(Qt VVV)" was calledRolf Eike Beer2015-01-161-1/+5
| | | | | | | | | | | | | | In case the given version was not only "3" or "4", but something like "4.8" DESIRED_QT_VERSION was set to an unsupported value. While at it also check that the version passed in is really in the range of 3.x and 4.x. Also suggest switching to the more specific find modules if possible.
* | Merge branch 'fix-qcc-compiler-id' into releaseBrad King2015-01-153-3/+3
|\ \ | |/ |/|
| * QNX: Fix detection of QCC compiler id (#15349)Brad King2015-01-143-3/+3
| | | | | | | | | | | | | | In commit v3.1.0-rc1~113^2 (Use a more reliable regex for extracting binary INFO strings, 2014-09-03) the matching of INFO: strings was made more strict and no longer matches just "INFO:qnxnto". Use "INFO:qnxnto[]" instead to conform to the new pattern.
* | Merge branch 'FindRuby-zero-version' into releaseBrad King2015-01-141-1/+1
|\ \
| * | FindRuby: fix selection of version x.0 (#15345)David Coppa2015-01-121-1/+1
| | | | | | | | | | | | | | | When "Ruby_FIND_VERSION_MINOR" is 0, the "if(Ruby_FIND_VERSION_MAJOR AND Ruby_FIND_VERSION_MINOR)" check evaluated to false.
* | | Merge branch 'FindRuby-fix-version' into releaseBrad King2015-01-141-1/+1
|\ \ \
| * | | FindRuby: Fix output check in _RUBY_CONFIG_VAREvangelos Foutras2015-01-111-1/+1
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v2.8.8~173^2 (FindRuby: clean up querying variables from Ruby, 2012-02-17) we query RbConfig::CONFIG first and, if the command fails or its output equates to a false constant, then fall back to querying Config::CONFIG. Due to the above, an error condition exists with Ruby 2.2.0; when querying RbConfig::CONFIG['TEENY'], the output of '0' will be discarded since it matches the false constant '0'. In previous versions this wasn't a problem, but Ruby 2.2 has completely removed Config::CONFIG. This causes RUBY_VERSION_PATCH to be set to an empty string and the Ruby version to be detected as '2.2.' (instead of '2.2.0'). Fix the output check to explicitly look for an empty string before using the fallback query method. (Someone more familiar with Ruby might be able to deem the fallback as unnecessary and fully remove it.)
* | | Merge branch 'FindBoost-update-versions' into releaseBrad King2015-01-141-1/+1
|\ \ \
| * | | FindBoost: Add latest Boost version 1.57.0 and next milestone 1.58.0Sergey Nikulov2015-01-131-1/+1
| |/ /
* | | Merge branch 'linux-XL-fortran' into releaseBrad King2015-01-143-0/+3
|\ \ \
| * | | XL: Fix link flags for executables on Linux with XL compilersBrad King2015-01-123-0/+3
| |/ / | | | | | | | | | | | | Use "-Wl,-export-dynamic" with XL to match the "-rdynamic" flag used with GNU-like compilers.
* | | Merge branch 'xcode-ios-compiler-id' into releaseBrad King2015-01-122-6/+1
|\ \ \ | |_|/ |/| |
| * | Xcode: Do not require code signing for compiler id (#15214)Brad King2015-01-112-6/+1
| |/ | | | | | | | | | | | | | | The approach in commit v3.1.0-rc1~1^2 (Xcode: Fix compiler id detection when code signing is required, 2014-10-22) still requires a code signing key when targeting a real device. Instead set CODE_SIGNING_REQUIRED to "NO" to tell Xcode not to sign at all. Drop the corresponding setting of the code signing identity.
* | Merge branch 'FindSDL-quoting' into releaseBrad King2015-01-081-1/+1
|\ \
| * | FindSDL: Allow if() to dereference SDL_INCLUDE_DIR for matchingRolf Eike Beer2015-01-081-1/+1
| | | | | | | | | | | | Otherwise the syntax is incorrect when the variable is empty.
* | | Merge branch 'FindCUDA-cross' into releaseBrad King2015-01-081-2/+2
|\ \ \
| * | | FindCUDA: Do not assume CMAKE_SYSTEM_PROCESSOR is setMark Abraham2015-01-081-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | CMAKE_SYSTEM_PROCESSOR is not guaranteed to be defined (per http://www.cmake.org/Wiki/CMake_Cross_Compiling), and when cross compiling where it happens to be undefined, this module was broken. Reviewed-by: Rolf Eike Beer <eike@sf-mail.de>
* | | Merge branch 'FindIce-CMP0054' into releaseBrad King2015-01-081-5/+5
|\ \ \ | |/ / |/| |
| * | FindIce: Port to work with CMP0054 NEW behaviorRolf Eike Beer2015-01-081-5/+5
| |/ | | | | | | Do not quote if() arguments meant to test variable definitions.
* | Help: Small fixes in CPackComponent documentationDaniele E. Domenichelli2014-12-221-2/+2
|/
* Merge branch 'xerces-rename' into releaseBrad King2014-12-051-33/+33
|\
| * Modules: Rename FindXerces to FindXercesCBrad King2014-12-041-33/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The FindXerces module was added in commit v3.1.0-rc1~155^2 (FindXerces: New module to find Apache Xerces-C++, 2014-08-17). However, there are two implementations of Xerces, one in C++: http://xerces.apache.org/xerces-c/ and one in Java: http://xerces.apache.org/xerces-j/ Rename FindXerces to FindXercesC to clarify that it is about the C++ implementation. While at it, add the missing CMake 3.1 release note about this module. Suggested-by: Erik Sjölund <erik.sjolund@gmail.com>
* | Merge branch 'CPackIFW-doc-typos' into releaseBrad King2014-12-031-11/+11
|\ \
| * | CPackIFW: Correction of the module documentationKonstantin Podsvirov2014-12-021-11/+11
| |/
* | Merge branch 'FindOpenGL-revert-imported-targets' into releaseBrad King2014-12-021-40/+0
|\ \
| * | FindOpenGL: Revert support for imported targets (#15267)Brad King2014-12-011-40/+0
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Revert the feature added by commit v3.1.0-rc1~420^2~2 (FindOpenGL: Provide imported targets for GL and GLU, 2014-05-31). Unfortunately it does not work on Windows because the full path to each library file is not actually known. The IMPORTED_LOCATION of an imported target must be a full path, but OPENGL_gl_LIBRARY is just 'opengl32' on Windows because the actual library file is in some implicit link directory that we may know know. More infrastructure will be needed in CMake to allow a name-only imported library. Until that exists, we will not be able to provide imported targets in FindOpenGL.
* | Merge branch 'FindPythonInterp-Fix-1.4' into releaseBrad King2014-12-021-2/+2
|\ \
| * | FindPythonInterp: fix version component variables for Python 1.4 (#15275)Rolf Eike Beer2014-12-021-2/+2
| | | | | | | | | | | | | | | This bug was introduced in "FindPythonInterp: rework the version detection" 7d6db93de9ffc6e6092fa722aaf9c057dadcd634.
* | | Merge branch 'fix-implicit-lib-logging' into releaseBrad King2014-12-011-1/+2
|\ \ \ | |/ / |/| |
| * | CMakeParseImplicitLinkInfo: Fix implicit library loggingBrad King2014-12-011-1/+2
| |/ | | | | | | | | | | | | | | | | | | In commit v3.1.0-rc1~640^2~5 (Clean up usage of if(... MATCHES regex) followed string(REGEX REPLACE regex), 2014-04-06) we accidentally broke logging of the implicit library detection. Restore use of the intermediate 'lib' variable so that the log message is constructed properly. Reported-by: Bill Somerville <bill@classdesign.com>
* | Merge branch 'FindwxWidgets-new-versions' into releaseBrad King2014-11-261-0/+2
|\ \
| * | FindwxWidgets: Add versions 3.0.1 and 3.0.2Christopher Gittner2014-11-261-0/+2
| |/
* | Merge branch 'C-features-Wundef' into releaseBrad King2014-11-262-4/+4
|\ \
| * | WCDH: Make the header -Wundef safe for the C language.Stephen Kelly2014-11-252-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | The __STDC_VERSION__ macro may be defined or not depending on the implementation dialect of C. Test that it is defined before testing its value. The CXX tests do not need such a change because they define __cplusplus in all dialects.
* | | Merge branch 'fix-WCDH-docs' into releaseBrad King2014-11-251-1/+1
|\ \ \
| * | | WCDH: Don't imply that MSVC is supported by the module.Stephen Kelly2014-11-231-1/+1
| |/ / | | | | | | | | | Remove the mention of it from the docs.
* | | Merge branch 'fix-GNU-CXX-dialect-versions' into releaseBrad King2014-11-251-4/+3
|\ \ \
| * | | Features: Record C++11 dialect switch only for GNU 4.7 and later.Stephen Kelly2014-11-191-4/+3
| |/ / | | | | | | | | | | | | Previous versions of GNU are not currently supported by this CMake feature.
* | | Merge branch 'default-lang-dialect' into releaseBrad King2014-11-252-5/+12
|\ \ \
| * | | Features: Fix the default C dialect for Clang and GNU.Stephen Kelly2014-11-202-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Clang 3.4 uses C99 by default, and Clang 3.6 uses C11 by default: http://thread.gmane.org/gmane.comp.compilers.clang.devel/39379 GNU 4.9 uses C90 by default, and GNU 5.0 uses C11 by default: https://gcc.gnu.org/gcc-5/changes.html Test that the default compiler settings result in the expected dialect macros being defined for both C and CXX. Remove the unused main.c file from the CompileFeatures unit test.
| * | | Features: Fix references to CXX compiler version in Clang-C.cmake.Stephen Kelly2014-11-181-2/+2
| |/ /
* | | Merge branch 'fix-openmp-fortran' into releaseBrad King2014-11-201-5/+5
|\ \ \