summaryrefslogtreecommitdiffstats
path: root/Modules
Commit message (Collapse)AuthorAgeFilesLines
* Features: Make cxx_noexcept available from GNU 4.6.Stephen Kelly2015-01-151-1/+1
| | | | As listed in the reference document.
* Features: Ensure appropriate return value from feature test macros.Stephen Kelly2015-01-156-12/+5
| | | | | | | GNU-CXX already has complex logic and sets the _result to 0 before tests which may set it to something else. Change the other modules to be consistent with that.
* Merge topic 'FindGit-local-Github'Brad King2015-01-151-0/+4
|\ | | | | | | | | | | ff880ece Help: Add notes for topic 'FindGit-local-Github' 54690624 FindGit: Search in 'GitHub for Windows' user directory
| * FindGit: Search in 'GitHub for Windows' user directoryFrank Park2015-01-131-0/+4
| |
* | Merge topic 'Apple-compiler-selection'Brad King2015-01-151-8/+23
|\ \ | | | | | | | | | | | | | | | | | | da928d30 Help: Add notes for topic 'Apple-compiler-selection' 1f085e11 OS X: Resolve compiler in /usr/bin to that reported by Xcode xcrun 85d31735 CMakeDetermineCompiler: Factor out xcrun invocation into a macro
| * | OS X: Resolve compiler in /usr/bin to that reported by Xcode xcrunStephen Kelly2015-01-141-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compiler in the PATH on mac is a stub for a different delegate depending on the environment. Rather than requiring xcode-select to change the used Xcode globally, users should be able to choose the compiler per-session. That is possible with the DEVELOPER_DIR environment variable. However, the environment can change between running CMake and invoking the build. In such cases, CMake prefers to record the relevant paths from the environment and use them when invoking the build. That is not currently done for the compilers on APPLE, so the compiler used is not the one reported when running cmake: $ DEVELOPER_DIR=/Applications/Xcode2.app/Contents/Developer/ cc --version Apple LLVM version 6.0 (clang-600.0.51) (based on LLVM 3.5svn) Target: x86_64-apple-darwin13.4.0 Thread model: posix $ DEVELOPER_DIR=/Applications/Xcode.app/Contents/Developer/ cc --version Apple LLVM version 5.1 (clang-503.0.38) (based on LLVM 3.4svn) Target: x86_64-apple-darwin13.4.0 Thread model: posix Update that now by querying Xcode for the correct compiler path if the compiler located by ordinary means is located in /usr/bin.
| * | CMakeDetermineCompiler: Factor out xcrun invocation into a macroStephen Kelly2015-01-141-4/+11
| | | | | | | | | | | | This will allow it to be re-used in multiple code paths later.
* | | Merge topic 'safer-msmpi-checks'Brad King2015-01-151-1/+3
|\ \ \ | | | | | | | | | | | | | | | | 68857ccd FindMPI: handle trailing slash from $MSMPI_BIN
| * | | FindMPI: handle trailing slash from $MSMPI_BINBen Boeckel2015-01-141-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When installing, MSMPI puts a trailing backslash in the MSMPI_BIN environment variable. This causes trouble when concatenating in CMake since the list separator is now escaped and no longer a list separator due to the trailing backslash. Instead, use file(TO_CMAKE_PATH) to make the path CMake-friendly.
* | | | Merge topic 'Xcode-clang-compile-features'Brad King2015-01-154-17/+44
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | dcd72a74 Help: Add notes for topic 'Xcode-clang-compile-features' 3ad893b5 Features: Record for historical Xcode clang versions. 98965fb1 Features: Record dialect flags for AppleClang 4.0+.
| * | | | Features: Record for historical Xcode clang versions.Stephen Kelly2015-01-114-15/+39
| | | | |
| * | | | Features: Record dialect flags for AppleClang 4.0+.Stephen Kelly2015-01-112-2/+5
| | |/ / | |/| |
* | | | Merge topic 'FindBoost-update-versions'Brad King2015-01-151-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | 4048f7cd FindBoost: Add latest Boost version 1.57.0 and next milestone 1.58.0
| * | | | FindBoost: Add latest Boost version 1.57.0 and next milestone 1.58.0Sergey Nikulov2015-01-131-1/+1
| | | | |
* | | | | Merge topic 'FindRuby-fix-version'Brad King2015-01-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | 802d0aa0 FindRuby: Fix output check in _RUBY_CONFIG_VAR
| * | | | | 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 topic 'FindRuby-zero-version'Brad King2015-01-151-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | dd5d2eb1 FindRuby: fix selection of version x.0 (#15345)
| * | | | | 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 'FindSDL-quoting' into releaseBrad King2015-01-081-1/+1
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'FindCUDA-cross' into releaseBrad King2015-01-081-2/+2
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'FindIce-CMP0054' into releaseBrad King2015-01-081-5/+5
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge topic 'revert-feature_record_msvc'Brad King2015-01-155-134/+2
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ce110bb Tests: Revert workaround for COMPILE_FEATURES genex bug 0b7e7e27 Revert topic 'feature_record_msvc'
| * | | | | | | | Revert topic 'feature_record_msvc'Brad King2015-01-145-134/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert commits: 2d738ce3 Help: Add notes for topic 'feature_record_msvc' f73718c9 Features: Enable writing of MSVC compiler feature header. 64c30bdc Features: Record for MSVC C++ 2015 and MSVC C 2010-2015. 225c0ef8 Features: Record for MSVC 2010-2013. This topic was merged to master prematurely, so remove it.
* | | | | | | | | Merge topic 'Apple-GNU-compiler-features'Brad King2015-01-122-3/+3
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 00f66a04 Record compile features for GNU on Apple.
| * | | | | | | | | Record compile features for GNU on Apple.Stephen Kelly2015-01-112-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tested with GNU 4.8 binary (bottle) from homebrew, and assumed to work with the others.
* | | | | | | | | | Merge topic 'xcode-ios-compiler-id'Brad King2015-01-122-6/+1
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b7209f6 Xcode: Do not require code signing for compiler id (#15214)
| * | | | | | | | | | 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 topic 'FindLATEX-components'Brad King2015-01-121-8/+159
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 89e08de8 FindLATEX: Add components for XeLaTeX and LuaLaTeX c32f6919 FindLATEX: Add components Biber and xindy 222ee2c0 FindLATEX: Add components PDFtoPS and HTLATEX 07a3f9ad FindLATEX: Add components handling
| * | | | | | | | | | FindLATEX: Add components for XeLaTeX and LuaLaTeXChristoph Grüninger2015-01-111-1/+32
| | | | | | | | | | |
| * | | | | | | | | | FindLATEX: Add components Biber and xindyChristoph Grüninger2015-01-111-0/+30
| | | | | | | | | | |
| * | | | | | | | | | FindLATEX: Add components PDFtoPS and HTLATEXChristoph Grüninger2015-01-111-0/+30
| | | | | | | | | | |
| * | | | | | | | | | FindLATEX: Add components handlingChristoph Grüninger2014-12-231-7/+67
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'FindOpenSSL-use-header-version'Brad King2015-01-121-3/+1
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 99b13820 FindOpenSSL: Always extract version from detected header (#15075)
| * | | | | | | | | | | FindOpenSSL: Always extract version from detected header (#15075)Aku Kotkavuo2015-01-111-3/+1
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do not use the _OPENSSL_VERSION computed by pkg-config because the user may change OPENSSL_INCLUDE_DIR.
* | | | | | | | | | | Merge topic 'linux-XL-fortran'Brad King2015-01-113-0/+3
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4729547a XL: Fix link flags for executables on Linux with XL compilers
| * | | | | | | | | | XL: Fix link flags for executables on Linux with XL compilersBrad King2015-01-103-0/+3
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "-Wl,-export-dynamic" with XL to match the "-rdynamic" flag used with GNU-like compilers.
* | | | | | | | | | Merge topic 'FindCUDA.cmake/UseCMAKE_CXX_FLAGS_separableCompilation'Brad King2015-01-111-1/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | b4e54f9b FindCUDA: Add relevant CMAKE_{C,CXX}_FLAGS for separable compilation
| * | | | | | | | | | FindCUDA: Add relevant CMAKE_{C,CXX}_FLAGS for separable compilationJames Bigler2015-01-061-1/+9
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously only the CMAKE_{C,CXX}_FLAGS_<CONFIG> flags were inspected for relevant flags when compiling the intermediate link file. We need to also consider the configuration agnostic flags, CMAKE_{C,CXX}_FLAGS as well.
* | | | | | | | | | Merge topic 'feature_record_msvc'Brad King2015-01-115-2/+134
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | / / / / / | | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 2d738ce3 Help: Add notes for topic 'feature_record_msvc' f73718c9 Features: Enable writing of MSVC compiler feature header. 64c30bdc Features: Record for MSVC C++ 2015 and MSVC C 2010-2015. 225c0ef8 Features: Record for MSVC 2010-2013.
| * | | | | | | | Features: Enable writing of MSVC compiler feature header.Robert Maynard2015-01-111-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Notes: VS2015 and above are the only MSVC versions to support cxx_final, so remove usages from the tests, and instead only test for cxx_override. VS2012 and above to conform to cxx_decltype_incomplete_return_types proposal, but without support for auto return types the dcl.type.simple example in the proposal doesn't compile. VS2013 and above to conform to the updated cxx_contextual_conversions proposal, but VS2010 and above pass the test. Compilers such as MSVC have no explicit flags to enable C++11 mode, it just is always on. So only run the link tests with compilers that require a flag to specify the language version.
| * | | | | | | | Features: Record for MSVC C++ 2015 and MSVC C 2010-2015.Robert Maynard2015-01-114-16/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Initializer lists are only properly supported in 2015 and above. Previous Visual Studio releases said they supported initializer lists but silently produced bad code.
| * | | | | | | | Features: Record for MSVC 2010-2013.Stephen Kelly2015-01-112-0/+69
| |/ / / / / / /
* | | | | | | | Merge topic 'WCDH-thread_local-portability'Brad King2015-01-081-0/+15
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 998e9c10 WCDH: Add feature portability for thread_local.
| * | | | | | | | WCDH: Add feature portability for thread_local.Stephen Kelly2015-01-011-0/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AppleClang does not support the cxx_thread_local feature, even though it is based on a Clang version which does support the feature. http://stackoverflow.com/a/23850891/2428389 A possible reason for that is that thread_local might be used as a variable in existing Apple SDK headers. Extend the WriteCompilerDetectionHeader module to generate a define for that feature with portability fallbacks. For the avoidance of making it easy to write code which looks correct but which has odd runtime behavior, don't set the define symbol at all if no equivalent keyword is known.
* | | | | | | | Merge topic 'record-GNU-5-features'Brad King2015-01-081-0/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 998ed4ca Features: Record cxx_variable_templates for GNU 5.0.
| * | | | | | | | Features: Record cxx_variable_templates for GNU 5.0.Stephen Kelly2015-01-011-0/+7
| |/ / / / / / /
* | | | | | | | Merge topic 'FindSDL-quoting'Brad King2015-01-081-1/+1
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | 67516fb5 FindSDL: Allow if() to dereference SDL_INCLUDE_DIR for matching
| * | | | | | | 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 topic 'find-msmpi'Brad King2015-01-081-3/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ab4d1d07 FindMPI: MSMPI changed the subdirectories it uses 82724394 FindMPI: add more search paths for MSMPI
| * | | | | | | FindMPI: MSMPI changed the subdirectories it usesBen Boeckel2015-01-061-3/+5
| | | | | | | |