[Cmake-commits] CMake branch, next, updated. v3.3.1-2797-g83a8b1e

Chuck Atkins chuck.atkins at kitware.com
Wed Sep 9 09:50:42 EDT 2015


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  83a8b1e1adfefc5ad3ed4ebe925f86a457a0f55b (commit)
       via  4daa9e76f860281b3e2db526ab06821a4316be70 (commit)
      from  25bd677f8135f6d574ed66576a39de20fd0ff6c4 (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=83a8b1e1adfefc5ad3ed4ebe925f86a457a0f55b
commit 83a8b1e1adfefc5ad3ed4ebe925f86a457a0f55b
Merge: 25bd677 4daa9e7
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Sep 9 09:50:41 2015 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Wed Sep 9 09:50:41 2015 -0400

    Merge topic 'restrict-shlib-link-flags-to-enable-exports' into next
    
    4daa9e76 CMP0065: Convert tests from C++ to C


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=4daa9e76f860281b3e2db526ab06821a4316be70
commit 4daa9e76f860281b3e2db526ab06821a4316be70
Author:     Chuck Atkins <chuck.atkins at kitware.com>
AuthorDate: Wed Sep 9 09:50:10 2015 -0400
Commit:     Chuck Atkins <chuck.atkins at kitware.com>
CommitDate: Wed Sep 9 09:50:10 2015 -0400

    CMP0065: Convert tests from C++ to C

diff --git a/Tests/RunCMake/CMP0065/NEWBad.cmake b/Tests/RunCMake/CMP0065/NEWBad.cmake
index f5bea7f..e25bc9d 100644
--- a/Tests/RunCMake/CMP0065/NEWBad.cmake
+++ b/Tests/RunCMake/CMP0065/NEWBad.cmake
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.3)
-project(TestCMP0065 CXX)
+project(TestCMP0065 C)
 include(BuildTargetInSubProject.cmake)
 
 BuildTargetInSubProject(TestPolicyCMP0065 FooNEWBad FALSE)
diff --git a/Tests/RunCMake/CMP0065/NEWGood.cmake b/Tests/RunCMake/CMP0065/NEWGood.cmake
index 9276812..66f822d 100644
--- a/Tests/RunCMake/CMP0065/NEWGood.cmake
+++ b/Tests/RunCMake/CMP0065/NEWGood.cmake
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.3)
-project(TestCMP0065 CXX)
+project(TestCMP0065 C)
 include(BuildTargetInSubProject.cmake)
 
 BuildTargetInSubProject(TestPolicyCMP0065 FooNEWGood TRUE)
diff --git a/Tests/RunCMake/CMP0065/OLDBad1.cmake b/Tests/RunCMake/CMP0065/OLDBad1.cmake
index d92d4cb..7234808 100644
--- a/Tests/RunCMake/CMP0065/OLDBad1.cmake
+++ b/Tests/RunCMake/CMP0065/OLDBad1.cmake
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.3)
-project(TestCMP0065 CXX)
+project(TestCMP0065 C)
 include(BuildTargetInSubProject.cmake)
 
 BuildTargetInSubProject(TestPolicyCMP0065 FooOLDBad1 FALSE)
diff --git a/Tests/RunCMake/CMP0065/OLDBad2.cmake b/Tests/RunCMake/CMP0065/OLDBad2.cmake
index f2c371b..2c877d9 100644
--- a/Tests/RunCMake/CMP0065/OLDBad2.cmake
+++ b/Tests/RunCMake/CMP0065/OLDBad2.cmake
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.3)
-project(TestCMP0065 CXX)
+project(TestCMP0065 C)
 include(BuildTargetInSubProject.cmake)
 
 BuildTargetInSubProject(TestPolicyCMP0065 FooOLDBad2 FALSE)
diff --git a/Tests/RunCMake/CMP0065/subproject/CMakeLists.txt b/Tests/RunCMake/CMP0065/subproject/CMakeLists.txt
index ecbe32d..2f081ba 100644
--- a/Tests/RunCMake/CMP0065/subproject/CMakeLists.txt
+++ b/Tests/RunCMake/CMP0065/subproject/CMakeLists.txt
@@ -1,22 +1,22 @@
 cmake_minimum_required(VERSION 3.2)
 
-project(TestPolicyCMP0065 CXX)
-set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS BADFLAGS)
+project(TestPolicyCMP0065 C)
+set(CMAKE_SHARED_LIBRARY_LINK_C_FLAGS BADFLAGS)
 
 #----------------------------------------------------------------------
 cmake_policy(SET CMP0065 OLD)
-add_executable(FooOLDBad1 main.cxx)
+add_executable(FooOLDBad1 main.c)
 
 #----------------------------------------------------------------------
-cmake_policy(SET CMP0065 NEW)
-add_executable(FooOLDBad2 main.cxx)
+cmake_policy(SET CMP0065 OLD)
+add_executable(FooOLDBad2 main.c)
 set_target_properties(FooOLDBad2 PROPERTIES ENABLE_EXPORTS ON)
 
 #----------------------------------------------------------------------
 cmake_policy(SET CMP0065 NEW)
-add_executable(FooNEWGood main.cxx)
+add_executable(FooNEWGood main.c)
 
 #----------------------------------------------------------------------
 cmake_policy(SET CMP0065 NEW)
-add_executable(FooNEWBad main.cxx)
+add_executable(FooNEWBad main.c)
 set_target_properties(FooNEWBad PROPERTIES ENABLE_EXPORTS ON)
diff --git a/Tests/RunCMake/CMP0065/subproject/main.c b/Tests/RunCMake/CMP0065/subproject/main.c
new file mode 100644
index 0000000..98725db
--- /dev/null
+++ b/Tests/RunCMake/CMP0065/subproject/main.c
@@ -0,0 +1,7 @@
+#include <stdio.h>
+
+int main(int argc, char **argv)
+{
+  printf("Hello World\n");
+  return 0;
+}
diff --git a/Tests/RunCMake/CMP0065/subproject/main.cxx b/Tests/RunCMake/CMP0065/subproject/main.cxx
deleted file mode 100644
index e4c66ac..0000000
--- a/Tests/RunCMake/CMP0065/subproject/main.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include <iostream>
-
-int main(int argc, char **argv)
-{
-  std::cout << "Hello World!" << std::endl;
-  return 0;
-}

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

Summary of changes:
 Tests/RunCMake/CMP0065/NEWBad.cmake                      |    2 +-
 Tests/RunCMake/CMP0065/NEWGood.cmake                     |    2 +-
 Tests/RunCMake/CMP0065/OLDBad1.cmake                     |    2 +-
 Tests/RunCMake/CMP0065/OLDBad2.cmake                     |    2 +-
 Tests/RunCMake/CMP0065/subproject/CMakeLists.txt         |   14 +++++++-------
 .../main.cpp => CMP0065/subproject/main.c}               |    2 ++
 Tests/RunCMake/CMP0065/subproject/main.cxx               |    7 -------
 7 files changed, 13 insertions(+), 18 deletions(-)
 copy Tests/RunCMake/{CompatibleInterface/main.cpp => CMP0065/subproject/main.c} (51%)
 delete mode 100644 Tests/RunCMake/CMP0065/subproject/main.cxx


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list