From 00333c785ab02c7010c2e07981d5d792c218c9ee Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Mon, 30 Mar 2026 11:32:26 +0200 Subject: remove examples "dynamic" & "static" To be specific the "dynamic" example is the new "simple". I don't need 3 basic example projects, one is enough. --- examples/dynamic/CMakeLists.txt | 11 ----------- examples/dynamic/baz.cpp | 7 ------- examples/dynamic/baz.hpp | 9 --------- examples/dynamic/foo.cpp | 9 --------- examples/simple/CMakeLists.txt | 6 +++++- examples/simple/baz.cpp | 7 +++++++ examples/simple/baz.hpp | 9 +++++++++ examples/simple/foo.cpp | 3 +++ examples/static/CMakeLists.txt | 11 ----------- examples/static/bar.cpp | 7 ------- examples/static/bar.hpp | 3 --- examples/static/foo.cpp | 9 --------- 12 files changed, 24 insertions(+), 67 deletions(-) delete mode 100644 examples/dynamic/CMakeLists.txt delete mode 100644 examples/dynamic/baz.cpp delete mode 100644 examples/dynamic/baz.hpp delete mode 100644 examples/dynamic/foo.cpp create mode 100644 examples/simple/baz.cpp create mode 100644 examples/simple/baz.hpp delete mode 100644 examples/static/CMakeLists.txt delete mode 100644 examples/static/bar.cpp delete mode 100644 examples/static/bar.hpp delete mode 100644 examples/static/foo.cpp (limited to 'examples') diff --git a/examples/dynamic/CMakeLists.txt b/examples/dynamic/CMakeLists.txt deleted file mode 100644 index 7c35f2e..0000000 --- a/examples/dynamic/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.15) - -project(example_dynamic) - -add_library(baz SHARED baz.cpp) -target_include_directories(baz PUBLIC .) - -add_executable(foo foo.cpp) -target_link_libraries(foo PRIVATE baz) - -install(TARGETS foo baz RUNTIME DESTINATION bin LIBRARY DESTINATION lib) diff --git a/examples/dynamic/baz.cpp b/examples/dynamic/baz.cpp deleted file mode 100644 index d108ae3..0000000 --- a/examples/dynamic/baz.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "baz.hpp" - -#include - -void baz() { - std::cout << "baz\n"; -} diff --git a/examples/dynamic/baz.hpp b/examples/dynamic/baz.hpp deleted file mode 100644 index 2fc9b2a..0000000 --- a/examples/dynamic/baz.hpp +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once - -#ifdef _MSC_VER -#define DLLEXPORT __declspec(dllexport) -#else -#define DLLEXPORT -#endif - -DLLEXPORT void baz(); diff --git a/examples/dynamic/foo.cpp b/examples/dynamic/foo.cpp deleted file mode 100644 index 7e928e1..0000000 --- a/examples/dynamic/foo.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#include - -int main() { - std::cout << "foo\n"; - baz(); - return 0; -} diff --git a/examples/simple/CMakeLists.txt b/examples/simple/CMakeLists.txt index f2ba4d4..50a588b 100644 --- a/examples/simple/CMakeLists.txt +++ b/examples/simple/CMakeLists.txt @@ -2,6 +2,10 @@ cmake_minimum_required(VERSION 3.15) project(example_simple) +add_library(baz SHARED baz.cpp) +target_include_directories(baz PUBLIC .) + add_executable(foo foo.cpp) +target_link_libraries(foo PRIVATE baz) -install(TARGETS foo RUNTIME DESTINATION bin) +install(TARGETS foo baz RUNTIME DESTINATION bin LIBRARY DESTINATION lib) diff --git a/examples/simple/baz.cpp b/examples/simple/baz.cpp new file mode 100644 index 0000000..d108ae3 --- /dev/null +++ b/examples/simple/baz.cpp @@ -0,0 +1,7 @@ +#include "baz.hpp" + +#include + +void baz() { + std::cout << "baz\n"; +} diff --git a/examples/simple/baz.hpp b/examples/simple/baz.hpp new file mode 100644 index 0000000..2fc9b2a --- /dev/null +++ b/examples/simple/baz.hpp @@ -0,0 +1,9 @@ +#pragma once + +#ifdef _MSC_VER +#define DLLEXPORT __declspec(dllexport) +#else +#define DLLEXPORT +#endif + +DLLEXPORT void baz(); diff --git a/examples/simple/foo.cpp b/examples/simple/foo.cpp index b9d3132..7e928e1 100644 --- a/examples/simple/foo.cpp +++ b/examples/simple/foo.cpp @@ -1,6 +1,9 @@ +#include + #include int main() { std::cout << "foo\n"; + baz(); return 0; } diff --git a/examples/static/CMakeLists.txt b/examples/static/CMakeLists.txt deleted file mode 100644 index c3ebbe4..0000000 --- a/examples/static/CMakeLists.txt +++ /dev/null @@ -1,11 +0,0 @@ -cmake_minimum_required(VERSION 3.15) - -project(example_static) - -add_library(bar bar.cpp) -target_include_directories(bar PUBLIC .) - -add_executable(foo foo.cpp) -target_link_libraries(foo PRIVATE bar) - -install(TARGETS foo bar RUNTIME DESTINATION bin ARCHIVE DESTINATION lib) diff --git a/examples/static/bar.cpp b/examples/static/bar.cpp deleted file mode 100644 index 37aa9b5..0000000 --- a/examples/static/bar.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "bar.hpp" - -#include - -void bar() { - std::cout << "bar\n"; -} diff --git a/examples/static/bar.hpp b/examples/static/bar.hpp deleted file mode 100644 index a3ea4c1..0000000 --- a/examples/static/bar.hpp +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -void bar(); diff --git a/examples/static/foo.cpp b/examples/static/foo.cpp deleted file mode 100644 index 34cd82e..0000000 --- a/examples/static/foo.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#include - -int main() { - std::cout << "foo\n"; - bar(); - return 0; -} -- cgit v1.3