summaryrefslogtreecommitdiffstats
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: Update the default_dialect test for old GNU-like compilers.Stephen Kelly2015-01-151-1/+1
| | | | | Prior to GNU 4.7, GNU defined __cplusplus incorrectly, and defined __GXX_EXPERIMENTAL_CXX0X__ in C++11 mode.
* 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.
* Features: Extend the tests for the COMPILE_FEATURES genex.Stephen Kelly2015-01-152-0/+81
|
* Merge branch 'release'Brad King2015-01-150-0/+0
|\
| * Merge branch 'cpack-PackageMaker-OSX-10.10' into releaseBrad King2015-01-152-10/+26
| |\
| * \ Merge branch 'fix-LOCATION-with-TARGET_OBJECTS' into releaseBrad King2015-01-145-0/+21
| |\ \
| * \ \ Merge branch 'FindRuby-zero-version' into releaseBrad King2015-01-141-1/+1
| |\ \ \
| * \ \ \ Merge branch 'FindRuby-fix-version' into releaseBrad King2015-01-141-1/+1
| |\ \ \ \
| * \ \ \ \ Merge branch 'FindBoost-update-versions' into releaseBrad King2015-01-141-1/+1
| |\ \ \ \ \
* | \ \ \ \ \ Merge topic 'FindGit-local-Github'Brad King2015-01-152-0/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ff880ece Help: Add notes for topic 'FindGit-local-Github' 54690624 FindGit: Search in 'GitHub for Windows' user directory
| * | | | | | | Help: Add notes for topic 'FindGit-local-Github'Brad King2015-01-141-0/+5
| | | | | | | |
| * | | | | | | FindGit: Search in 'GitHub for Windows' user directoryFrank Park2015-01-131-0/+4
| | | | | | | |
* | | | | | | | Merge topic 'Apple-compiler-selection'Brad King2015-01-152-8/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | | | | Help: Add notes for topic 'Apple-compiler-selection'Brad King2015-01-141-0/+8
| | | | | | | | |
| * | | | | | | | 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-156-17/+69
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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+.
| * | | | | | | | | | Help: Add notes for topic 'Xcode-clang-compile-features'Brad King2015-01-141-0/+5
| | | | | | | | | | |
| * | | | | | | | | | Features: Record for historical Xcode clang versions.Stephen Kelly2015-01-115-15/+59
| | | | | | | | | | |
| * | | | | | | | | | Features: Record dialect flags for AppleClang 4.0+.Stephen Kelly2015-01-112-2/+5
| | | | | | | | | | |
* | | | | | | | | | | Merge topic 'zlib-suppress-warnings'Brad King2015-01-151-0/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 74b8f786 zlib: Disable warnings to avoid changing 3rd party code
| * | | | | | | | | | | zlib: Disable warnings to avoid changing 3rd party codeBrad King2015-01-141-0/+8
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'delete-algorithm'Brad King2015-01-1520-208/+68
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 65b81da4 cmVariableWatch: Use the cmDeleteAll algorithm with for_each. 30d2de9a cmGeneratorExpressionEvaluator: Replace own algorithm with cmDeleteAll. 4a6e795b Use the cmDeleteAll algorithm instead of trivial raw loops. abb4a678 Add a generic algorithm for deleting items in a container.
| * | | | | | | | | | | | cmVariableWatch: Use the cmDeleteAll algorithm with for_each.Stephen Kelly2015-01-131-13/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | cmGeneratorExpressionEvaluator: Replace own algorithm with cmDeleteAll.Stephen Kelly2015-01-131-24/+3
| | | | | | | | | | | | |
| * | | | | | | | | | | | Use the cmDeleteAll algorithm instead of trivial raw loops.Stephen Kelly2015-01-1317-171/+30
| | | | | | | | | | | | |
| * | | | | | | | | | | | Add a generic algorithm for deleting items in a container.Stephen Kelly2015-01-131-0/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Specialize for std::map types to delete the second element from the iterator. This is not quite general enough that it can be used everywhere, because CMake inherits from std::map and creates typedefs with custom comparison functors etc, which can not use this algorithm.
* | | | | | | | | | | | | Merge topic 'fix-COMPILE_FEATURES-genex'Brad King2015-01-153-9/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 45ec182d Features: Fix the COMPILE_FEATURES genex for unavailable features. 2bead0eb cmMakefile: Rename a method to what it really does.
| * | | | | | | | | | | | | Features: Fix the COMPILE_FEATURES genex for unavailable features.Stephen Kelly2015-01-121-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, the genex tested only for CMake knowledge of the feature, but not compiler knowledge of the feature.
| * | | | | | | | | | | | | cmMakefile: Rename a method to what it really does.Stephen Kelly2015-01-123-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method does not test availability of compile features.
* | | | | | | | | | | | | | Merge topic 'fix-LOCATION-with-TARGET_OBJECTS'Brad King2015-01-155-0/+21
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 23f3798c cmTarget: Compute link language of TARGET_OBJECTS with CMP0026 OLD (#15338)
| * | | | | | | | | | | | | cmTarget: Compute link language of TARGET_OBJECTS with CMP0026 OLD (#15338)Stephen Kelly2015-01-135-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit v3.1.0-rc1~297^2~5 (cmTarget: Drop 'head' argument from GetSourceFiles, 2014-07-10) exposed a dormant bug in source file computation, causing the test case to regress. After that commit, the source file computation and caching finds an existing container of source files. Prior to that patch, the GetSourceFiles method was called with either a null pointer for the head cmTarget, or it was called with the this pointer. The processSources method is eventually called, which normalizes the difference between the null pointer and the this pointer for the head target. However, the cache key depends on the actual pre-normalized pointer. The change in that commit caused the entry to be found in the cache where it was not before, which resulted in incorrect behavior. Prior to that commit, the test case also fails if the GetSourceFiles overload taking a vector<cmSourceFile*> is changed to normalize the head target at the beginning of the method: cmTarget const* head = head_ ? head_ : this; Such a construct was correctly used in other locations where similar caching was in place, before being removed in commit v3.1.0-rc1~310^2~25 (cmTarget: Remove 'head' argument from GetLinkInformation, 2014-06-12), but is not neccessary anymore. Commit v3.1.0-rc1~674^2~2 (cmTarget: Cache the cmSourceFiles in GetSourceFiles., 2014-04-05) introduced the caching, but fails the test case for an unrelated reason. That unrelated error was introduced in commit v3.1.0-rc1~688^2~5 (cmTarget: Allow any generator expression in SOURCES property., 2014-03-18) and fixed in commit v3.1.0-rc1~561^2~1 (cmTarget: Fix listing of source files at configure-time., 2014-04-13). All commits which fail the test case in the testable way do so when such a cached version of the source files is found and returned at generate time. In the test case, the cached content is populated at configure-time through the use of the deprecated LOCATION property with CMP0026 OLD. The cached content is an empty container for the bar target in the test case, because its source file 'foo.cpp.o' is not known until generate-time. That means that no source files are available to compute the link language and the reported error is issued. The actual problem is that the SourceFilesMap should be cleared after configure time by cmTarget::ClearLinkMaps. Clear it there now.
* | | | | | | | | | | | | | Merge topic 'cpack-PackageMaker-OSX-10.10'Brad King2015-01-152-10/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 70abf6e7 CPack: Fix PackageMaker internal versioning for OS X 10.10
| * | | | | | | | | | | | | CPack: Fix PackageMaker internal versioning for OS X 10.10Calin Cascaval2015-01-122-10/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using a floating point value to represent the version, since "10.10" would be treated as "10.1".
* | | | | | | | | | | | | | 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 topic 'revert-feature_record_msvc'Brad King2015-01-1511-186/+8
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4ce110bb Tests: Revert workaround for COMPILE_FEATURES genex bug 0b7e7e27 Revert topic 'feature_record_msvc'
| * | | | | | | | | | | Tests: Revert workaround for COMPILE_FEATURES genex bugBrad King2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The second hunk of commit 07d1f6fc (Features: Properly evaluate if the compiler supports cxx_final, 2014-12-31) was a workaround for a bug in the COMPILE_FEATURES generator expression that caused it never to return 0. Revert the workaround so we can fix the bug instead.
| * | | | | | | | | | | Revert topic 'feature_record_msvc'Brad King2015-01-1410-185/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | | | | | CMake Nightly Date StampKitware Robot2015-01-151-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Merge topic 'Apple-GNU-compiler-features'Brad King2015-01-141-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | f121b6b1 Help: Add notes for topic 'Apple-GNU-compiler-features'
| * | | | | | | | | | | | Help: Add notes for topic 'Apple-GNU-compiler-features'Brad King2015-01-141-0/+5
| | | | | | | | | | | | |
* | | | | | | | | | | | | Merge topic 'find-msmpi'Brad King2015-01-141-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a3513cee Help: Add notes for topic 'find-msmpi'
generated by cgit v0.12 at 2025-01-01 13:43:24 (GMT)