summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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 '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
|\ \ \
| * | | FindOpenMP: Use fixed form Fortran test programNils Gladitz2014-11-201-5/+5
| |/ / | | | | | | | | | | | | | | | This prevents the test program from failing when build as Fortran 77. Suggested-by: Alin Marin Elena <alinm.elena@gmail.com>
* | | Merge branch 'backport-fix-CMP0054-MSVC' into releaseBrad King2014-11-205-12/+12
|\ \ \
| * | | Avoid if() quoted auto-dereference when checking for "MSVC"Fraser Hutchison2014-11-195-12/+12
| | | | | | | | | | | | | | | | | | | | When testing CMAKE_<LANG>_COMPILER_ID values against "MSVC", do not allow the definition of the "MSVC" variable to be expanded.
* | | | Merge branch 'FindJava-no-osx-stub' into releaseBrad King2014-11-191-1/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | FindJava: Do not accept OS X stub 'java' as JavaBrad King2014-11-191-1/+4
| |/ / | | | | | | | | | | | | | | | | | | | | | OS X provides a stub 'java' to inform callers that Java is not present. When checking the 'java -version' output, look for such a message and if found pretend 'java' was not found. Suggested-by: Sean McBride <sean@rogue-research.com>
* | | Features: Don't record for AppleClangStephen Kelly2014-11-121-1/+2
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | Features are currently recorded accidentally for all versions of AppleClang > 3.4 (I have no idea how that relates to upstream Clang). Presumably that version has the features which are accidentally recorded, but in the future features will be recorded initially for only AppleClang >= 5.1, which would appear as a feature regression. Commit v3.1.0-rc1~635^2~11 (Don't load Clang-CXX from AppleClang-CXX., 2013-11-11) ajusted the logic for the CXX language. Make a similar change for the C language.
* | Merge branch 'ExternalProject-check-hash-before-download' into releaseBrad King2014-11-101-1/+14
|\ \
| * | ExternalProject: Restore logic to not download already-existing fileBrad King2014-11-101-1/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change in commit v3.1.0-rc1~85^2 (ExternalProject: Fix download retry logic, 2014-09-13) dropped the file(DOWNLOAD) EXPECTED_HASH argument. This prevents file(DOWNLOAD) from skipping the download if the output file already exists with the proper hash. Restore this check with explicit code in the download script. Reported-by: Ruslan Baratov <ruslan_baratov@yahoo.com>
* | | Merge branch 'xcode-ios-compiler-id' into releaseBrad King2014-11-071-1/+1
|\ \ \
| * | | Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)Brad King2014-11-071-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit v3.1.0-rc1~1^2~1 (Xcode: Fix compiler id detection for iOS tools, 2014-10-22) our compiler id detection project sets the product type to 'com.apple.product-type.bundle.unit-test'. This causes the Ld command line on which we match the path to the compiler to have a 'CompilerIdC.xctest/' component. The commit updated our regex to match this, but placed it before the extra './' component that Xcode 5.0 and below produce. Xcode <= 5.0 prints '/./CompilerIdC.xctest/', so switch the order of the two components in the regex to match it.
* | | Merge branch 'doc-cleanup-xrefs' into releaseBrad King2014-11-072-2/+2
|\ \ \
| * | | Help: Fix broken cross-references reported by 'nitpicky' optionBrad King2014-11-072-2/+2
| | | | | | | | | | | | | | | | | | | | Enable the Sphinx 'nitpicky' option and fix the resulting warnings about dangling references.
* | | | Merge branch 'doc-formatting' into releaseBrad King2014-11-071-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Help: Wrap long lines in pre-formatted documentation blocksBrad King2014-11-071-1/+2
| | | | | | | | | | | | | | | | Help format the blocks better for display without a wide screen.
* | | | Merge branch 'release-doc-formatting' into releaseBrad King2014-11-0713-140/+102
|\ \ \ \ | |/ / /
| * | | Modules: Wrap long lines in pre-formatted documentation blocksBrad King2014-11-0612-29/+38
| | | | | | | | | | | | | | | | Help format the blocks better for display without a wide screen.
| * | | FindProtobuf: Cleanup reStructuredText documentation formattingBrad King2014-11-061-111/+64
| | | | | | | | | | | | | | | | Fix the markup to make the documentation format properly.
* | | | Merge branch 'FindIce-no-envvar-markup' into releaseBrad King2014-11-031-1/+1
|\ \ \ \
| * | | | FindIce: Drop use of :envvar: Sphinx markupBrad King2014-11-031-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | We do not use it elsewhere yet, and do not want to index environment variables inconsistently.
* | | | Merge branch 'watcom-drop-symfile-option' into releaseBrad King2014-11-031-2/+2
|\ \ \ \
| * | | | Watcom: Drop symfile linker optionJ Decker2014-11-031-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup of Windows-wcl386.cmake in commit v3.1.0-rc1~693^2 (Watcom: Cleanup Windows-wcl386 configuration, 2014-04-01) also introduced use of the 'symfile' link option but did not mention it in the commit message. There is no way to set the symbol file name of a target, so it is better to revert that change. It is easy to run 'wstrip *' if the symbols need to be stripped, but it is very difficult to get the right names for the .sym files to install with debug/rel_with_deb_info configurations.
* | | | Merge branch 'fix-configure_file-COPYONLY' into releaseBrad King2014-11-031-1/+1
|\ \ \ \
| * | | | Qt4: Fix configure_file call to use COPYONLY, not COPY_ONLYBrad King2014-10-311-1/+1
| |/ / /
* | | | Merge branch 'FindCurses-include-CheckLibraryExists' into releaseBrad King2014-10-291-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | FindCurses: Include CheckLibraryExists before using it (#15220)Brad King2014-10-281-1/+2
| |/ / | | | | | | | | | | | | Include the module at the top unconditionally so that all code paths can use it.
* | | Merge branch 'xcode-ios-compiler-id' into releaseBrad King2014-10-222-3/+19
|\ \ \
| * | | Xcode: Fix compiler id detection when code signing is requiredBrad King2014-10-222-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The iOS product type 'com.apple.package-type.bundle.unit-test' requires code signing on Xcode 6. Other iOS target types do too. Until CMake learns to add the CODE_SIGN_IDENTITY build attribute itself, toolchain files can set CMAKE_XCODE_ATTRIBUTE_CODE_SIGN_IDENTITY to tell the Xcode generator to add the attribute. Teach CMakeDetermineCompilerId to recognize this variable and add the CODE_SIGN_IDENTITY build attribute to the compiler id project.