[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7757-g75cc98b
Brad King
brad.king at kitware.com
Mon Feb 17 12:29:16 EST 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 75cc98bc7997c51ead0851772858ecaa39271423 (commit)
via 91258edf151dc1c2b1c28813a2c06afd49542570 (commit)
from c2688a3204966eed52a87b9a2691ea3562e17eca (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=75cc98bc7997c51ead0851772858ecaa39271423
commit 75cc98bc7997c51ead0851772858ecaa39271423
Merge: c2688a3 91258ed
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 17 12:29:16 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 17 12:29:16 2014 -0500
Merge topic 'cmake-toolchain-requirements' into next
91258edf Revert topic 'cmake-toolchain-requirements'
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91258edf151dc1c2b1c28813a2c06afd49542570
commit 91258edf151dc1c2b1c28813a2c06afd49542570
Author: Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 17 12:28:43 2014 -0500
Commit: Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 17 12:28:43 2014 -0500
Revert topic 'cmake-toolchain-requirements'
At request by author.
diff --git a/Tests/SystemInformation/CMakeLists.txt b/Tests/SystemInformation/CMakeLists.txt
index cd6b2e3..838fd4a 100644
--- a/Tests/SystemInformation/CMakeLists.txt
+++ b/Tests/SystemInformation/CMakeLists.txt
@@ -58,125 +58,4 @@ get_directory_property(res INCLUDE_REGULAR_EXPRESSION)
file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/OtherProperties.txt
"INCLUDE_REGULAR_EXPRESSION: ${res}\n")
-macro(test_compiler_capability NAME CODE)
- file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.cpp" "${CODE}
-int main() { return 0; }
-")
- unset(${NAME} CACHE)
- try_compile(${NAME} "${CMAKE_CURRENT_BINARY_DIR}/${NAME}"
- "${CMAKE_CURRENT_BINARY_DIR}/${NAME}.cpp"
- OUTPUT_VARIABLE OUTPUT
- )
- message("${NAME}: ${${NAME}}")
- if (NOT ${NAME})
- message("OUTPUT: ${OUTPUT}")
- endif()
-endmacro()
-
-test_compiler_capability(HAVE_MEMBER_TEMPLATES "
-class Foo
-{
- template<typename T>
- void foo(T t) { (void)t; }
-};
-")
-
-test_compiler_capability(HAVE_VECTOR_AT "
-#include <vector>
-int foo()
-{
- std::vector<int> vec;
- vec.push_back(1);
- return vec.at(0);
-}
-")
-
-test_compiler_capability(HAVE_STRING_APPEND "
-#include <string>
-void foo()
-{
- std::string s;
- s.append(\"content\");
-}
-")
-
-test_compiler_capability(HAVE_STRING_CLEAR "
-#include <string>
-void foo()
-{
- std::string s;
- s.clear();
-}
-")
-
-test_compiler_capability(HAVE_BINARY_SEARCH_CONVERSION "
-#include <vector>
-#include <string>
-#include <algorithm>
-void foo()
-{
- const char* needle = \"content\";
- std::vector<std::string> vec;
- std::binary_search(vec.begin(), vec.end(), needle);
-}
-")
-
-test_compiler_capability(HAVE_TEMPLATE_NON_FUNCTION_PARAMETERS "
-template<typename PropertyType>
-PropertyType getTypedProperty(const char* prop)
-{
- PropertyType t;
- return t;
-}
-
-int foo()
-{
- return getTypedProperty<int>(0);
-}
-")
-
-
-test_compiler_capability(HAVE_TEMPLATE_PARAMETER_DEFAULTED_POINTER "
-template<typename PropertyType>
-PropertyType getTypedProperty(const char* prop,
- PropertyType* = 0)
-{
- PropertyType t;
- return t;
-}
-
-int foo()
-{
- return getTypedProperty<int>(0);
-}
-")
-
-test_compiler_capability(HAVE_STD_SIZE_T "
-#include <cstddef>
-
-void foo()
-{
- std::size_t sz = sizeof(int);
-}
-")
-
-test_compiler_capability(HAVE_TEMPLATE_FRIENDS "
-#include <cstddef>
-
-template<typename T>
-void bar();
-
-class Foo
-{
-private:
- template<typename T> friend void bar();
- void foo() {}
-};
-template<typename T>
-void bar()
-{
- Foo f;
- f.foo();
-}
-")
-----------------------------------------------------------------------
Summary of changes:
Tests/SystemInformation/CMakeLists.txt | 121 --------------------------------
1 file changed, 121 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list