[Cmake-commits] CMake branch, next, updated. v2.8.11.2-3355-g7dcbcb8

Ben Boeckel ben.boeckel at kitware.com
Wed Jul 24 14:03:11 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  7dcbcb8273d5ba29af09e8123a033da4896c3694 (commit)
       via  36caa36fe3ab0a9f3cd2df10460bcdecbba04e1f (commit)
       via  29e4590668ce5be84aaeed47e832c7d1630b4de6 (commit)
       via  5a6a36409bc4a722a9974c077f9ac2e5ff662152 (commit)
      from  f8d8b6fc345d38bad76f52d87469cbfebeda3011 (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=7dcbcb8273d5ba29af09e8123a033da4896c3694
commit 7dcbcb8273d5ba29af09e8123a033da4896c3694
Merge: f8d8b6f 36caa36
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jul 24 14:03:07 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Jul 24 14:03:07 2013 -0400

    Merge topic 'dev/export-target-without-language' into next
    
    36caa36 Merge topic 'tll-new-signatures' into dev/export-target-without-language
    29e4590 Update RunCMake documentation
    5a6a364 Use RunCMake machinery for ExportWithoutLanguage


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=36caa36fe3ab0a9f3cd2df10460bcdecbba04e1f
commit 36caa36fe3ab0a9f3cd2df10460bcdecbba04e1f
Merge: 29e4590 b655865
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jul 24 14:02:53 2013 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Jul 24 14:02:53 2013 -0400

    Merge topic 'tll-new-signatures' into dev/export-target-without-language
    
    * commit 'b655865b':
      target_link_libraries: Add PUBLIC/PRIVATE/INTERFACE keyword signature
      Use linked frameworks as a source of include directories.
      set_property: Do not remove a property when APPENDing nothing
      FindQt4: Don't use Qt component _FOUND vars before they're defined (#14286)
      Genex: Fix $<CONFIG> with IMPORTED targets and multiple locations.
      Remove the LINK_LANGUAGE generator expression.
      CMake Nightly Date Stamp
      CMake Nightly Date Stamp
      Ninja: Properly convert all paths to unix style before we do set intersection.
      FindCUDA: Search for libraries in <prefix>/lib/<arch>/nvidida-current.
      Remove TODO to uniq COMPILE_OPTIONS
      Don't add trailing whitespace to error message.
    
    Conflicts:
    	Tests/RunCMake/CMakeLists.txt

diff --cc Tests/RunCMake/CMakeLists.txt
index 46752b8,12f68d7..6d1bca2
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@@ -115,4 -115,4 +115,5 @@@ if("${CMAKE_TEST_GENERATOR}" MATCHES "V
  endif()
  
  add_RunCMake_test(File_Generate)
 +add_RunCMake_test(ExportWithoutLanguage)
+ add_RunCMake_test(target_link_libraries)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=29e4590668ce5be84aaeed47e832c7d1630b4de6
commit 29e4590668ce5be84aaeed47e832c7d1630b4de6
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jul 24 14:01:21 2013 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Jul 24 14:01:21 2013 -0400

    Update RunCMake documentation

diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index e49081e..46752b8 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -28,7 +28,7 @@
 #   <SubTest>-stdout.txt  = Regex matching expected stdout content
 #   <SubTest>-stderr.txt  = Regex matching expected stderr content
 #   <SubTest>-check.cmake = Custom result check
-# Note that trailing newlines will be stripped from actual test
+# Note that trailing newlines will be stripped from actual and expected test
 # output before matching against the stdout and stderr expressions.
 # The code in <SubTest>-check.cmake may use variables
 #   RunCMake_TEST_SOURCE_DIR = Top of test source tree

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=5a6a36409bc4a722a9974c077f9ac2e5ff662152
commit 5a6a36409bc4a722a9974c077f9ac2e5ff662152
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Wed Jul 24 14:00:50 2013 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Wed Jul 24 14:00:50 2013 -0400

    Use RunCMake machinery for ExportWithoutLanguage

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index dfd2226..fcefaf9 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -240,13 +240,10 @@ if(BUILD_TESTING)
   ADD_TEST_MACRO(ExportImport ExportImport)
   ADD_TEST_MACRO(Unset Unset)
   ADD_TEST_MACRO(PolicyScope PolicyScope)
-  ADD_TEST_MACRO(ExportWithoutLanguage ExportWithoutLanguage)
   ADD_TEST_MACRO(EmptyLibrary EmptyLibrary)
   ADD_TEST_MACRO(CompileDefinitions CompileDefinitions)
   ADD_TEST_MACRO(CompileOptions CompileOptions)
   ADD_TEST_MACRO(CompatibleInterface CompatibleInterface)
-  set_tests_properties(ExportWithoutLanguage PROPERTIES
-    PASS_REGULAR_EXPRESSION "Exporting the target \"NoLanguage\" is not allowed since its linker language")
   set_tests_properties(EmptyLibrary PROPERTIES
     PASS_REGULAR_EXPRESSION "CMake Error: CMake can not determine linker language for target: test")
   ADD_TEST_MACRO(CrossCompile CrossCompile)
diff --git a/Tests/ExportWithoutLanguage/header.h b/Tests/ExportWithoutLanguage/header.h
deleted file mode 100644
index e69de29..0000000
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index 66ce3f1..e49081e 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -115,3 +115,4 @@ if("${CMAKE_TEST_GENERATOR}" MATCHES "Visual Studio [^6]")
 endif()
 
 add_RunCMake_test(File_Generate)
+add_RunCMake_test(ExportWithoutLanguage)
diff --git a/Tests/RunCMake/ExportWithoutLanguage/CMakeLists.txt b/Tests/RunCMake/ExportWithoutLanguage/CMakeLists.txt
new file mode 100644
index 0000000..e8db6b0
--- /dev/null
+++ b/Tests/RunCMake/ExportWithoutLanguage/CMakeLists.txt
@@ -0,0 +1,3 @@
+cmake_minimum_required(VERSION 2.8)
+project(${RunCMake_TEST} NONE)
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-result.txt b/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-result.txt
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-result.txt
@@ -0,0 +1 @@
+1
diff --git a/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-stderr.txt b/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-stderr.txt
new file mode 100644
index 0000000..67a0ae3
--- /dev/null
+++ b/Tests/RunCMake/ExportWithoutLanguage/NoLanguage-stderr.txt
@@ -0,0 +1,6 @@
+CMake Error: CMake can not determine linker language for target: NoLanguage
+CMake Error at NoLanguage.cmake:2 \(export\):
+  Exporting the target "NoLanguage" is not allowed since its linker language
+  cannot be determined
+Call Stack \(most recent call first\):
+  CMakeLists.txt:3 \(include\)
diff --git a/Tests/ExportWithoutLanguage/CMakeLists.txt b/Tests/RunCMake/ExportWithoutLanguage/NoLanguage.cmake
similarity index 100%
rename from Tests/ExportWithoutLanguage/CMakeLists.txt
rename to Tests/RunCMake/ExportWithoutLanguage/NoLanguage.cmake
diff --git a/Tests/RunCMake/ExportWithoutLanguage/RunCMakeTest.cmake b/Tests/RunCMake/ExportWithoutLanguage/RunCMakeTest.cmake
new file mode 100644
index 0000000..f77f4eb
--- /dev/null
+++ b/Tests/RunCMake/ExportWithoutLanguage/RunCMakeTest.cmake
@@ -0,0 +1,3 @@
+include(RunCMake)
+
+run_cmake(NoLanguage)

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

Summary of changes:
 Tests/CMakeLists.txt                               |    3 ---
 Tests/RunCMake/CMakeLists.txt                      |    3 ++-
 .../CMakeLists.txt                                 |    0
 .../NoLanguage-result.txt}                         |    0
 .../ExportWithoutLanguage/NoLanguage-stderr.txt    |    6 ++++++
 .../ExportWithoutLanguage/NoLanguage.cmake}        |    0
 .../ExportWithoutLanguage/RunCMakeTest.cmake       |    3 +++
 7 files changed, 11 insertions(+), 4 deletions(-)
 delete mode 100644 Tests/ExportWithoutLanguage/header.h
 copy Tests/RunCMake/{CMP0004 => ExportWithoutLanguage}/CMakeLists.txt (100%)
 copy Tests/RunCMake/{CMP0004/CMP0004-NEW-result.txt => ExportWithoutLanguage/NoLanguage-result.txt} (100%)
 create mode 100644 Tests/RunCMake/ExportWithoutLanguage/NoLanguage-stderr.txt
 rename Tests/{ExportWithoutLanguage/CMakeLists.txt => RunCMake/ExportWithoutLanguage/NoLanguage.cmake} (100%)
 create mode 100644 Tests/RunCMake/ExportWithoutLanguage/RunCMakeTest.cmake


hooks/post-receive
-- 
CMake

More information about the Cmake-commits mailing list