From 2e615d4be93635588ff7c3bd8d1ae74a01dd290c Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Sun, 9 Feb 2014 22:09:20 +0100 Subject: [PATCH] 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. --- 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 diff --git a/Example/CMakeLists.txt b/Example/CMakeLists.txt deleted file mode 100644 index 8ee7d721e..000000000 --- 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 477700fab..000000000 --- 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 815c8149e..000000000 --- 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 08a232913..000000000 --- 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 879f4e5b1..000000000 --- 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 7107cc555..000000000 --- a/Example/Hello/hello.cxx +++ /dev/null @@ -1,7 +0,0 @@ -#include "hello.h" -#include - -void Hello::Print() -{ - printf("Hello, World!\n"); -} diff --git a/Example/Hello/hello.h b/Example/Hello/hello.h deleted file mode 100644 index b17d68343..000000000 --- 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 1e04f2f97..8074a01d8 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"