summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Merge topic 'FindPythonInterp-Fix-1.4'Brad King2014-12-031-2/+2
|\ | | | | | | | | 4c8c3ba9 FindPythonInterp: fix version component variables for Python 1.4 (#15275)
| * 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 'FindwxWidgets-new-versions' into releaseBrad King2014-11-261-0/+2
| |\
| * \ Merge branch 'C-features-Wundef' into releaseBrad King2014-11-262-4/+4
| |\ \
| * \ \ Merge branch 'fix-WCDH-docs' into releaseBrad King2014-11-251-1/+1
| |\ \ \
| * \ \ \ Merge branch 'fix-GNU-CXX-dialect-versions' into releaseBrad King2014-11-251-4/+3
| |\ \ \ \
| * \ \ \ \ Merge branch 'default-lang-dialect' into releaseBrad King2014-11-252-5/+12
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'fix-openmp-fortran' into releaseBrad King2014-11-201-5/+5
| |\ \ \ \ \ \
| * \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ Merge topic 'CPackIFW-doc-typos'Brad King2014-12-031-11/+11
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4c07a00f CPackIFW: Correction of the module documentation
| * | | | | | | | | | CPackIFW: Correction of the module documentationKonstantin Podsvirov2014-12-021-11/+11
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'FindOpenGL-revert-imported-targets'Brad King2014-12-031-40/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 02e34de2 FindOpenGL: Revert support for imported targets (#15267)
| * | | | | | | | | | | 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 topic 'FindOpenGL-no-X11'Brad King2014-12-021-13/+0
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d051cbda FindOpenGL: Drop explicit dependency on X11 (#15268)
| * | | | | | | | | | | FindOpenGL: Drop explicit dependency on X11 (#15268)Brad King2014-12-011-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 079e8469ab (... OpenGL always needs X11 on Unix, 2002-09-05) the FindOpenGL module was taught to search for X11 as a dependency of the OpenGL library. This was done without a detailed explanation, and the dependency should not be explicitly needed because OpenGL headers should not expose applications to X11 APIs directly. Unfortunately the only way to know if anything legitimately depends on this behavior (perhaps in static library cases) is to simply remove it and wait for issues to be reported. If so, then we can add some kind of compatibility setting for this later. Add a release note to draw attention to this change. Reported-by: Dainius "GreatEmerald" Masiliūnas <pastas4@gmail.com>
* | | | | | | | | | | | Merge topic 'fix-implicit-lib-logging'Brad King2014-12-021-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 20bf6971 CMakeParseImplicitLinkInfo: Fix implicit library logging
| * | | | | | | | | | | | 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>
* | | | | | | | | | | | FindOpenSSL: Report crypto and ssl libraries separatelyHannes Mezger2014-12-011-4/+12
| |/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some applications only need the OpenSSL crypto library and want to avoid linking against the SSL library. Set OPENSSL_CRYPTO_LIBRARY and OPENSSL_SSL_LIBRARY in the code paths that do not need to find them separately, and document them publicly. This allows applications to be more specific when linking against OpenSSL.
* | | | | | | | | | | Merge topic 'FindwxWidgets-new-versions'Brad King2014-12-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 75dee2f2 FindwxWidgets: Add versions 3.0.1 and 3.0.2
| * | | | | | | | | | FindwxWidgets: Add versions 3.0.1 and 3.0.2Christopher Gittner2014-11-261-0/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge topic 'WCDH-multi-file'Brad King2014-11-261-4/+97
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4cf5179c WCDH: Make it possible to generate multiple files.
| * | | | | | | | | | WCDH: Make it possible to generate multiple files.Stephen Kelly2014-11-241-4/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the write_compiler_detection_header interface to allow specifying a location for supplementary files, and getting the list of resulting files as a variable.
* | | | | | | | | | | Merge topic 'C-features-Wundef'Brad King2014-11-262-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d0af0fae WCDH: Make the header -Wundef safe for the C language.
| * | | | | | | | | | 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 topic 'GetPrerequisites-expansion'Brad King2014-11-251-30/+16
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | d1903de8 GetPrerequisites: join if() clauses c9e32b0b GetPrerequisites: remove needless variable dereferencing
| * | | | | | | | | | GetPrerequisites: join if() clausesRolf Eike Beer2014-11-251-18/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These all test the same variable for different values, so only one of them can ever be true. This also allows to completely remove one variable that only flagged if one of the conditions matched.
| * | | | | | | | | | GetPrerequisites: remove needless variable dereferencingRolf Eike Beer2014-11-251-15/+15
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'fix-WCDH-docs'Brad King2014-11-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 0db3db41 WCDH: Don't imply that MSVC is supported by the module.
| * | | | | | | | | | 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 topic 'fix-GNU-CXX-dialect-versions'Brad King2014-11-251-4/+3
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | c03c184b Features: Record C++11 dialect switch only for GNU 4.7 and later.
| * | | | | | | | | 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 topic 'default-lang-dialect-for-master'Brad King2014-11-252-5/+12
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f327a9fd Merge branch 'default-lang-dialect' into step2 36bb100e Fix the test for running the CxxDialog unit test. a3d0ae17 Features: Fix the default C dialect for Clang and GNU. 49e2b689 Features: Fix references to CXX compiler version in Clang-C.cmake. 7565ab2c Features: Test the CXX compiler only if it has features.
| * \ \ \ \ \ \ \ \ Merge branch 'default-lang-dialect' into step2Stephen Kelly2014-11-202-5/+12
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | / | | | |_|_|_|_|_|/ | | |/| | | | | | Conflicts: Modules/Compiler/Clang-C.cmake
| | * | | | | | | 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 topic 'fix-openmp-fortran'Brad King2014-11-251-5/+5
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 7d633ebf FindOpenMP: Use fixed form Fortran test program
| * | | | | | | 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 topic 'CPackRPM-cleanup-component-vars'Brad King2014-11-251-3/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 51a60973 CPackRPM: Unset temporary component variables before re-use
| * | | | | | | CPackRPM: Unset temporary component variables before re-useGauthier Lamaison2014-11-181-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Improve the fix from commit v2.8.9~136^2 (CPackRPM: avoid leakage of RPM directive from one component to another, 2012-06-05) to clean up more temporary variables. Reviewed-by: Domen Vrankar <domen.vrankar@gmail.com>
* | | | | | | | Merge topic 'custom-command-byproducts'Brad King2014-11-251-0/+13
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 557aef0b ExternalProject: Add options to specify BYPRODUCTS (#14963) e15a7075 Add an option for explicit BYPRODUCTS of custom commands (#14963)
| * | | | | | | ExternalProject: Add options to specify BYPRODUCTS (#14963)Brad King2014-11-171-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The external project's build process may generate byproducts on which other rules in the driving project's build later depend. Provide a way for the driving project to specify what byproducts it expects to be made available by the custom commands that drive the external project.
* | | | | | | | Merge topic 'fix-CMP0054-MSVC'Brad King2014-11-205-11/+11
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa1a066a Merge branch 'backport-fix-CMP0054-MSVC' into fix-CMP0054-MSVC 4d52cd36 Avoid if() quoted auto-dereference when checking for "MSVC" 543c4304 Avoid if() quoted auto-dereference when checking for "MSVC"
| * | | | | | | | Avoid if() quoted auto-dereference when checking for "MSVC"Fraser Hutchison2014-11-195-11/+11
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When testing CMAKE_<LANG>_COMPILER_ID values against "MSVC", do not allow the definition of the "MSVC" variable to be expanded.
* | | | | | | | Merge topic 'FindJava-no-osx-stub'Brad King2014-11-201-1/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | / / | | |_|_|_|/ / | |/| | | | | dd378258 FindJava: Do not accept OS X stub 'java' as Java
| * | | | | | 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>
* | | | | | Merge topic 'FindCurses-no-cur_colr'Brad King2014-11-181-5/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | d931ba60 FindCurses: Drop search for deprecated HP-UX cur_colr library
| * | | | | FindCurses: Drop search for deprecated HP-UX cur_colr libraryÅdne Hovda2014-11-171-5/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since commit b22e2de8 (HPUX support, 2001-11-05) the FindCurses module searches for a 'cur_colr' library, but that is not needed anymore. AFAICT, the cur_colr package was introduced in HP-UX 10.00 and marked as deprecated in 10.30 by X/OPEN curses (which replaced the even older HP curses in 10.10). In order to use cur_colr after 10.10 you should use the /usr/include/curses_colr when compiling. Since FindCurses doesn't even search that path the headers cannot possibly match out of the box. If users want cur_colr they can set the cache entries by hand. There is no 64-bit version of cur_colr in 11.11PA and it will be gone completely in 11.31PA: http://h21007.www2.hp.com/portal/download/files/unprot/STK/HPUX_STK/impacts/i964.html It is simplest to drop cur_colr support from FindCurses since it was only partially implemented anyway.
* | | | | CPackRPM: remove unneeded string length calculationRolf Eike Beer2014-11-141-3/+1
| |/ / / |/| | | | | | | | | | | | | | | This wants just the rest of the string, which can be achieved by passing -1 as remainder length.