[Cmake-commits] CMake branch, next, updated. v2.8.11.2-4407-g0019a50

Daniele E. Domenichelli daniele.domenichelli at gmail.com
Wed Oct 2 12:35:22 EDT 2013 

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  0019a5018a6eaea919f66d1f39e0312f9da5c1ea (commit)
       via  b7f508fe64d94a02ceea860579ae700efc73f795 (commit)
       via  e0f041f2e874b80bc196c36ab440652790b00102 (commit)
      from  79f96440eb8869f253a23f6747762f221c0069a6 (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=0019a5018a6eaea919f66d1f39e0312f9da5c1ea
commit 0019a5018a6eaea919f66d1f39e0312f9da5c1ea
Merge: 79f9644 b7f508f
Author:     Daniele E. Domenichelli <daniele.domenichelli at gmail.com>
AuthorDate: Wed Oct 2 12:35:18 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Oct 2 12:35:18 2013 -0400

    Merge topic 'CheckStructHasMember_CXX' into next
    
    b7f508f Merge topic 'deprecation-message' into CheckStructHasMember_CXX
    e0f041f CheckStructHasMember: Add more unit tests


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b7f508fe64d94a02ceea860579ae700efc73f795
commit b7f508fe64d94a02ceea860579ae700efc73f795
Merge: e0f041f 3e781fc
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Oct 2 18:34:24 2013 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Oct 2 18:34:24 2013 +0200

    Merge topic 'deprecation-message' into CheckStructHasMember_CXX
    
    Conflicts:
    	Tests/RunCMake/CMakeLists.txt

diff --cc Tests/RunCMake/CMakeLists.txt
index 35c8e13,cc52e9e..f1c09bc
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -119,4 -119,4 +119,5 @@@ endif(
  add_RunCMake_test(File_Generate)
  add_RunCMake_test(ExportWithoutLanguage)
  add_RunCMake_test(target_link_libraries)
+ add_RunCMake_test(deprecation)
 +add_RunCMake_test(CheckModules)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e0f041f2e874b80bc196c36ab440652790b00102
commit e0f041f2e874b80bc196c36ab440652790b00102
Author:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
AuthorDate: Wed Oct 2 17:37:03 2013 +0200
Commit:     Daniele E. Domenichelli <daniele.domenichelli at iit.it>
CommitDate: Wed Oct 2 17:37:03 2013 +0200

    CheckStructHasMember: Add more unit tests

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index e45aba3..35c8e13 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -119,3 +119,4 @@ endif()
 add_RunCMake_test(File_Generate)
 add_RunCMake_test(ExportWithoutLanguage)
 add_RunCMake_test(target_link_libraries)
+add_RunCMake_test(CheckModules)
diff --git a/Tests/RunCMake/CheckModules/CMakeLists.txt b/Tests/RunCMake/CheckModules/CMakeLists.txt
new file mode 100644
index 0000000..65ac8e8
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8.11)
+project(${RunCMake_TEST})
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-result.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-stderr.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-stderr.txt
new file mode 100644
index 0000000..1b8603a
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at .*/Modules/CheckStructHasMember.cmake:[0-9]+. \(message\):
+  Unknown arguments:
+
+    C
+
+Call Stack \(most recent call first\):
+  CheckStructHasMemberMissingKey.cmake:[0-9]+ \(check_struct_has_member\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey.cmake b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey.cmake
new file mode 100644
index 0000000..49f51ce
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey.cmake
@@ -0,0 +1,2 @@
+include(CheckStructHasMember)
+check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC_K C)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-result.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-stderr.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-stderr.txt
new file mode 100644
index 0000000..8fceab0
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at .*/Modules/CheckStructHasMember.cmake:[0-9]+. \(message\):
+  Unknown arguments:
+
+    LANGUAGE
+
+Call Stack \(most recent call first\):
+  CheckStructHasMemberMissingLanguage.cmake:[0-9]+ \(check_struct_has_member\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage.cmake b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage.cmake
new file mode 100644
index 0000000..b404d66
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage.cmake
@@ -0,0 +1,2 @@
+include(CheckStructHasMember)
+check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC_K LANGUAGE)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake b/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake
new file mode 100644
index 0000000..b319e18
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake
@@ -0,0 +1,4 @@
+include(CheckStructHasMember)
+check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC)
+check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC_C LANGUAGE C)
+check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC_CXX LANGUAGE CXX)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments-result.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments-stderr.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments-stderr.txt
new file mode 100644
index 0000000..4598867
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at .*/Modules/CheckStructHasMember.cmake:[0-9]+. \(message\):
+  Unknown arguments:
+
+    LANGUAGE;C;CXX
+
+Call Stack \(most recent call first\):
+  CheckStructHasMemberTooManyArguments.cmake:[0-9]+ \(check_struct_has_member\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments.cmake b/Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments.cmake
new file mode 100644
index 0000000..12f8158
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments.cmake
@@ -0,0 +1,2 @@
+include(CheckStructHasMember)
+check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC_K LANGUAGE C CXX)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage-result.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage-stderr.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage-stderr.txt
new file mode 100644
index 0000000..ba9e313
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage-stderr.txt
@@ -0,0 +1,10 @@
+CMake Error at .*/Modules/CheckStructHasMember.cmake:[0-9]+. \(message\):
+  Unknown language:
+
+    FORTRAN
+
+  Supported languages: C, CXX.
+
+Call Stack \(most recent call first\):
+  CheckStructHasMemberUnknownLanguage.cmake:[0-9]+ \(check_struct_has_member\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage.cmake b/Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage.cmake
new file mode 100644
index 0000000..183058d
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage.cmake
@@ -0,0 +1,2 @@
+include(CheckStructHasMember)
+check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC_K LANGUAGE FORTRAN)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey-result.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey-stderr.txt b/Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey-stderr.txt
new file mode 100644
index 0000000..b9fbd38
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey-stderr.txt
@@ -0,0 +1,8 @@
+CMake Error at .*/Modules/CheckStructHasMember.cmake:[0-9]+. \(message\):
+  Unknown arguments:
+
+    LANGUAG;C
+
+Call Stack \(most recent call first\):
+  CheckStructHasMemberWrongKey.cmake:[0-9]+ \(check_struct_has_member\)
+  CMakeLists.txt:[0-9]+ \(include\)
diff --git a/Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey.cmake b/Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey.cmake
new file mode 100644
index 0000000..900eb0a
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey.cmake
@@ -0,0 +1,2 @@
+include(CheckStructHasMember)
+check_struct_has_member("struct timeval" tv_sec sys/select.h HAVE_TIMEVAL_TV_SEC_K LANGUAG C)
diff --git a/Tests/RunCMake/CheckModules/RunCMakeTest.cmake b/Tests/RunCMake/CheckModules/RunCMakeTest.cmake
new file mode 100644
index 0000000..6a6b36e
--- /dev/null
+++ b/Tests/RunCMake/CheckModules/RunCMakeTest.cmake
@@ -0,0 +1,8 @@
+include(RunCMake)
+
+run_cmake(CheckStructHasMemberOk)
+run_cmake(CheckStructHasMemberUnknownLanguage)
+run_cmake(CheckStructHasMemberMissingLanguage)
+run_cmake(CheckStructHasMemberMissingKey)
+run_cmake(CheckStructHasMemberTooManyArguments)
+run_cmake(CheckStructHasMemberWrongKey)

-----------------------------------------------------------------------

Summary of changes:
 Tests/RunCMake/CMakeLists.txt                      |    1 +
 .../CMakeLists.txt                                 |    0
 .../CheckStructHasMemberMissingKey-result.txt}     |    0
 .../CheckStructHasMemberMissingKey-stderr.txt      |    8 ++++++++
 .../CheckStructHasMemberMissingKey.cmake           |    2 ++
 ...CheckStructHasMemberMissingLanguage-result.txt} |    0
 .../CheckStructHasMemberMissingLanguage-stderr.txt |    8 ++++++++
 .../CheckStructHasMemberMissingLanguage.cmake      |    2 ++
 .../CheckModules/CheckStructHasMemberOk.cmake      |    4 ++++
 ...heckStructHasMemberTooManyArguments-result.txt} |    0
 ...CheckStructHasMemberTooManyArguments-stderr.txt |    8 ++++++++
 .../CheckStructHasMemberTooManyArguments.cmake     |    2 ++
 ...CheckStructHasMemberUnknownLanguage-result.txt} |    0
 .../CheckStructHasMemberUnknownLanguage-stderr.txt |   10 ++++++++++
 .../CheckStructHasMemberUnknownLanguage.cmake      |    2 ++
 .../CheckStructHasMemberWrongKey-result.txt}       |    0
 .../CheckStructHasMemberWrongKey-stderr.txt        |    8 ++++++++
 .../CheckStructHasMemberWrongKey.cmake             |    2 ++
 Tests/RunCMake/CheckModules/RunCMakeTest.cmake     |    8 ++++++++
 19 files changed, 65 insertions(+), 0 deletions(-)
 copy Tests/RunCMake/{ObsoleteQtMacros => CheckModules}/CMakeLists.txt (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CheckModules/CheckStructHasMemberMissingKey-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey-stderr.txt
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberMissingKey.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CheckModules/CheckStructHasMemberMissingLanguage-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage-stderr.txt
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberMissingLanguage.cmake
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberOk.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CheckModules/CheckStructHasMemberTooManyArguments-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments-stderr.txt
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberTooManyArguments.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CheckModules/CheckStructHasMemberUnknownLanguage-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage-stderr.txt
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberUnknownLanguage.cmake
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => CheckModules/CheckStructHasMemberWrongKey-result.txt} (100%)
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey-stderr.txt
 create mode 100644 Tests/RunCMake/CheckModules/CheckStructHasMemberWrongKey.cmake
 create mode 100644 Tests/RunCMake/CheckModules/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list