[Cmake-commits] CMake branch, next, updated. v2.8.12.2-7552-g12cac26
Stephen Kelly
steveire at gmail.com
Sun Feb 9 16:12:53 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 12cac26033e50e429252ee4ce0987dbda570ffd4 (commit)
via 2e615d4be93635588ff7c3bd8d1ae74a01dd290c (commit)
from 6f8a99e9b33d7b778463510bf44ed00a3623949f (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=12cac26033e50e429252ee4ce0987dbda570ffd4
commit 12cac26033e50e429252ee4ce0987dbda570ffd4
Merge: 6f8a99e 2e615d4
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 9 16:12:52 2014 -0500
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Sun Feb 9 16:12:52 2014 -0500
Merge topic 'remove-Example' into next
2e615d4b Remove the Example from the source.
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=2e615d4be93635588ff7c3bd8d1ae74a01dd290c
commit 2e615d4be93635588ff7c3bd8d1ae74a01dd290c
Author: Stephen Kelly <steveire at gmail.com>
AuthorDate: Sun Feb 9 22:09:20 2014 +0100
Commit: Stephen Kelly <steveire at gmail.com>
CommitDate: Sun Feb 9 22:09:20 2014 +0100
Remove the Example from the source.
It is not showing modern practice, and is obsolete as documentation
after the rst documentation system and new content.
diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt
deleted file mode 100644
index 8ee7d72..0000000
--- a/Example/CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-# The name of our project is "HELLO". CMakeLists files in this project can
-# refer to the root source directory of the project as ${HELLO_SOURCE_DIR} and
-# to the root binary directory of the project as ${HELLO_BINARY_DIR}.
-project (HELLO)
-
-# Recurse into the "Hello" and "Demo" subdirectories. This does not actually
-# cause another cmake executable to run. The same process will walk through
-# the project's entire directory structure.
-add_subdirectory (Hello)
-add_subdirectory (Demo)
diff --git a/Example/Demo/CMakeLists.txt b/Example/Demo/CMakeLists.txt
deleted file mode 100644
index 477700f..0000000
--- a/Example/Demo/CMakeLists.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-# Make sure the compiler can find include files from our Hello library.
-include_directories (${HELLO_SOURCE_DIR}/Hello)
-
-# Make sure the linker can find the Hello library once it is built.
-link_directories (${HELLO_BINARY_DIR}/Hello)
-
-# Add executable called "helloDemo" that is built from the source files
-# "demo.cxx" and "demo_b.cxx". The extensions are automatically found.
-add_executable (helloDemo demo.cxx demo_b.cxx)
-
-# Link the executable to the Hello library.
-target_link_libraries (helloDemo Hello)
diff --git a/Example/Demo/demo.cxx b/Example/Demo/demo.cxx
deleted file mode 100644
index 815c814..0000000
--- a/Example/Demo/demo.cxx
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "hello.h"
-
-extern Hello hello;
-
-int main()
-{
- hello.Print();
-
- return 0;
-}
diff --git a/Example/Demo/demo_b.cxx b/Example/Demo/demo_b.cxx
deleted file mode 100644
index 08a2329..0000000
--- a/Example/Demo/demo_b.cxx
+++ /dev/null
@@ -1,3 +0,0 @@
-#include "hello.h"
-
-Hello hello;
diff --git a/Example/Hello/CMakeLists.txt b/Example/Hello/CMakeLists.txt
deleted file mode 100644
index 879f4e5..0000000
--- a/Example/Hello/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-# Create a library called "Hello" which includes the source file "hello.cxx".
-# The extension is already found. Any number of sources could be listed here.
-add_library (Hello hello.cxx)
diff --git a/Example/Hello/hello.cxx b/Example/Hello/hello.cxx
deleted file mode 100644
index 7107cc5..0000000
--- a/Example/Hello/hello.cxx
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "hello.h"
-#include <stdio.h>
-
-void Hello::Print()
-{
- printf("Hello, World!\n");
-}
diff --git a/Example/Hello/hello.h b/Example/Hello/hello.h
deleted file mode 100644
index b17d683..0000000
--- a/Example/Hello/hello.h
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef _hello_h
-#define _hello_h
-
-
-class Hello
-{
-public:
- void Print();
-};
-
-#endif
diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index 1e04f2f..8074a01 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -1058,18 +1058,6 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
# because of the registry write these tests depend on each other
set_tests_properties ( complex PROPERTIES DEPENDS complexOneConfig)
- add_test(Example ${CMAKE_CTEST_COMMAND}
- --build-and-test
- "${CMake_SOURCE_DIR}/Example"
- "${CMake_BINARY_DIR}/Example"
- ${build_generator_args}
- --build-project HELLO
- --build-exe-dir "${CMake_BINARY_DIR}/Example/Demo"
- --build-options ${build_options}
- --test-command helloDemo
- )
- list(APPEND TEST_BUILD_DIRS "${CMake_BINARY_DIR}/Example")
-
add_test(Environment ${CMAKE_CTEST_COMMAND}
--build-and-test
"${CMake_SOURCE_DIR}/Tests/Environment"
-----------------------------------------------------------------------
Summary of changes:
Example/CMakeLists.txt | 10 ----------
Example/Demo/CMakeLists.txt | 12 ------------
Example/Demo/demo.cxx | 10 ----------
Example/Demo/demo_b.cxx | 3 ---
Example/Hello/CMakeLists.txt | 3 ---
Example/Hello/hello.cxx | 7 -------
Example/Hello/hello.h | 11 -----------
Tests/CMakeLists.txt | 12 ------------
8 files changed, 68 deletions(-)
delete mode 100644 Example/CMakeLists.txt
delete mode 100644 Example/Demo/CMakeLists.txt
delete mode 100644 Example/Demo/demo.cxx
delete mode 100644 Example/Demo/demo_b.cxx
delete mode 100644 Example/Hello/CMakeLists.txt
delete mode 100644 Example/Hello/hello.cxx
delete mode 100644 Example/Hello/hello.h
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list