summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* | | Merge topic 'no-AppleClang-C-features'Brad King2014-11-131-1/+2
|\ \ \ | | |/ | |/| | | | | | | ded30405 Features: Don't record for AppleClang
| * | 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
| |\ \
| * \ \ Merge branch 'xcode-ios-compiler-id' into releaseBrad King2014-11-071-1/+1
| |\ \ \
| * \ \ \ Merge branch 'doc-cleanup-xrefs' into releaseBrad King2014-11-072-2/+2
| |\ \ \ \
| * \ \ \ \ Merge branch 'doc-formatting' into releaseBrad King2014-11-071-1/+2
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'add-FindIntl'Brad King2014-11-132-0/+72
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | c5e797db FindIntl: New module to find Gettext libintl
| * | | | | | | FindIntl: New module to find Gettext libintlRoger Leigh2014-11-112-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for Sun/Uniforum/GNU gettext libintl. This belongs in CMake rather than upstream because: * There are multiple upstreams (Sun, GNU). * It may or may not be in the glibc C library depending upon the platform and build options used. Although we already have a FindGettext module, that is for the tools. This module is for the library, and is independent because it's perfectly OK to use libintl without the gettext tools (and vice versa), and they might not all be found. Add cross references between the two modules in notes to make the relationship clearer.
* | | | | | | | Merge topic 'compile-features-refactor'Brad King2014-11-136-70/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 32b91b9e Features: Run GNU feature tests with std=c++14 when available. 82c283f9 Features: Use the correct dialect flag when recording features. b18155b7 Features: Reorder the GNU C dialect feature tests e68d5c60 Features: Split the Clang testable features to a separate file.
| * | | | | | | | Features: Run GNU feature tests with std=c++14 when available.Stephen Kelly2014-11-121-1/+4
| | | | | | | | |
| * | | | | | | | Features: Use the correct dialect flag when recording features.Stephen Kelly2014-11-124-16/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using -std=c++1y for compilers which support -std=c++14, for example.
| * | | | | | | | Features: Reorder the GNU C dialect feature testsStephen Kelly2014-11-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This doesn't make a difference, but the consistency with other files is easier to reason about.
| * | | | | | | | Features: Split the Clang testable features to a separate file.Stephen Kelly2014-11-112-53/+55
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | These tests can be shared with the AppleClang compile feature tests.
* | | | | | | | Merge topic 'ExternalProject_UPDATE_DISCONNECTED'Brad King2014-11-131-1/+63
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 3c497f11 Help: Add notes for topic 'ExternalProject_UPDATE_DISCONNECTED' aba5cec6 ExternalProject: Add unit tests for UPDATE_DISCONNECTED 3f606fa7 ExternalProject: Add UPDATE_DISCONNECTED option c0b749cf ExternalProject: Always add a command to a step
| * | | | | | | ExternalProject: Add UPDATE_DISCONNECTED optionDaniele E. Domenichelli2014-11-061-1/+54
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If UPDATE_DISCONNECTED is set, the update step is not executed automatically when building the main target. The update step can still be added as a step target and called manually. This is useful if you want to allow to build the project when you are disconnected from the network (you might still need the network for the download step). This is disabled by default. The directory property EP_UPDATE_DISCONNECTED can be used to change the default value for all the external projects in the current directory and its subdirectories.
| * | | | | | | ExternalProject: Always add a command to a stepDaniele E. Domenichelli2014-11-061-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some generators (i.e. Xcode) will not generate a file level target if no command is set, and therefore the dependencies on this target will be broken. This patch sets an empty echo command that does nothing to avoid this issue.
* | | | | | | | Merge topic 'ExternalProject-check-hash-before-download'Brad King2014-11-111-1/+14
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | ee7405a6 ExternalProject: Restore logic to not download already-existing file
| * | | | | | | 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 topic 'make-fortran-preprocessor-assembly-targets'Brad King2014-11-108-11/+21
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b6b37e30 Makefile: Add assembly and preprocessed targets for Fortran 0842b084 Makefile: Refactor checks for lang-specific targets and export compile cmds
| * | | | | | | | Makefile: Add assembly and preprocessed targets for FortranTim Gallagher2014-11-108-11/+21
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Extend the FortranOnly test to cover "make <src>.i" targets.
* | | | | | | | Merge topic 'xcode-ios-compiler-id'Brad King2014-11-101-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | 7f89552a Xcode: Fix compiler path detection for iOS tools on Xcode <= 5.0 (#15237)
| * | | | | | | 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 topic 'doc-cleanup-xrefs'Brad King2014-11-072-2/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | 4c8c442d Help: Fix broken cross-references reported by 'nitpicky' option
| * | | | | | 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.