From 70da99e4f70845da37ae368c4788ecc18546792d Mon Sep 17 00:00:00 2001 From: Egor Tensin Date: Sat, 28 Mar 2020 17:19:43 +0000 Subject: WIP: restructure A stupid attempt to reduce code duplication led me to believe that all the scripts could use _a bit_ of refactoring. This is going to be a major pain (factoring out all the things), which I'll take gladly. All the links and usage examples are broken right now, but nobody cares, so whatevs. --- cmake/examples/boost/CMakeLists.txt | 14 -------------- cmake/examples/boost/foo.cpp | 11 ----------- cmake/examples/dynamic/CMakeLists.txt | 16 ---------------- cmake/examples/dynamic/baz.cpp | 7 ------- cmake/examples/dynamic/baz.hpp | 9 --------- cmake/examples/dynamic/foo.cpp | 6 ------ cmake/examples/simple/CMakeLists.txt | 12 ------------ cmake/examples/simple/foo.cpp | 6 ------ cmake/examples/static/CMakeLists.txt | 16 ---------------- cmake/examples/static/bar.cpp | 7 ------- cmake/examples/static/bar.hpp | 3 --- cmake/examples/static/foo.cpp | 6 ------ 12 files changed, 113 deletions(-) delete mode 100644 cmake/examples/boost/CMakeLists.txt delete mode 100644 cmake/examples/boost/foo.cpp delete mode 100644 cmake/examples/dynamic/CMakeLists.txt delete mode 100644 cmake/examples/dynamic/baz.cpp delete mode 100644 cmake/examples/dynamic/baz.hpp delete mode 100644 cmake/examples/dynamic/foo.cpp delete mode 100644 cmake/examples/simple/CMakeLists.txt delete mode 100644 cmake/examples/simple/foo.cpp delete mode 100644 cmake/examples/static/CMakeLists.txt delete mode 100644 cmake/examples/static/bar.cpp delete mode 100644 cmake/examples/static/bar.hpp delete mode 100644 cmake/examples/static/foo.cpp (limited to 'cmake/examples') diff --git a/cmake/examples/boost/CMakeLists.txt b/cmake/examples/boost/CMakeLists.txt deleted file mode 100644 index 8c076c9..0000000 --- a/cmake/examples/boost/CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -cmake_minimum_required(VERSION 3.5) # for Boost::* imported targets - -project(example_boost) - -include(../../common.cmake) - -find_package(Boost REQUIRED COMPONENTS filesystem) -add_executable(foo foo.cpp) -target_link_libraries(foo PRIVATE Boost::disable_autolinking Boost::filesystem) - -install(TARGETS foo RUNTIME DESTINATION bin) -if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - install(FILES "$" DESTINATION bin OPTIONAL) -endif() diff --git a/cmake/examples/boost/foo.cpp b/cmake/examples/boost/foo.cpp deleted file mode 100644 index 3bd0326..0000000 --- a/cmake/examples/boost/foo.cpp +++ /dev/null @@ -1,11 +0,0 @@ -#include - -#include - -int main(int argc, char* argv[]) { - std::cout << "Hello from " - << boost::filesystem::absolute(boost::filesystem::path{argv[0]}) - .string() - << "!\n"; - return 0; -} diff --git a/cmake/examples/dynamic/CMakeLists.txt b/cmake/examples/dynamic/CMakeLists.txt deleted file mode 100644 index 4602adb..0000000 --- a/cmake/examples/dynamic/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.1) - -project(example_dynamic) - -include(../../common.cmake) - -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) -if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - install(FILES "$" "$" DESTINATION bin OPTIONAL) -endif() diff --git a/cmake/examples/dynamic/baz.cpp b/cmake/examples/dynamic/baz.cpp deleted file mode 100644 index d108ae3..0000000 --- a/cmake/examples/dynamic/baz.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "baz.hpp" - -#include - -void baz() { - std::cout << "baz\n"; -} diff --git a/cmake/examples/dynamic/baz.hpp b/cmake/examples/dynamic/baz.hpp deleted file mode 100644 index 2fc9b2a..0000000 --- a/cmake/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/cmake/examples/dynamic/foo.cpp b/cmake/examples/dynamic/foo.cpp deleted file mode 100644 index b7d9986..0000000 --- a/cmake/examples/dynamic/foo.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main() { - baz(); - return 0; -} diff --git a/cmake/examples/simple/CMakeLists.txt b/cmake/examples/simple/CMakeLists.txt deleted file mode 100644 index 4f8859e..0000000 --- a/cmake/examples/simple/CMakeLists.txt +++ /dev/null @@ -1,12 +0,0 @@ -cmake_minimum_required(VERSION 3.1) - -project(example_simple) - -include(../../common.cmake) - -add_executable(foo foo.cpp) - -install(TARGETS foo RUNTIME DESTINATION bin) -if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - install(FILES "$" DESTINATION bin OPTIONAL) -endif() diff --git a/cmake/examples/simple/foo.cpp b/cmake/examples/simple/foo.cpp deleted file mode 100644 index b9d3132..0000000 --- a/cmake/examples/simple/foo.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main() { - std::cout << "foo\n"; - return 0; -} diff --git a/cmake/examples/static/CMakeLists.txt b/cmake/examples/static/CMakeLists.txt deleted file mode 100644 index 8a6acb8..0000000 --- a/cmake/examples/static/CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ -cmake_minimum_required(VERSION 3.1) - -project(example_static) - -include(../../common.cmake) - -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) -if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC") - install(FILES "$" DESTINATION bin OPTIONAL) -endif() diff --git a/cmake/examples/static/bar.cpp b/cmake/examples/static/bar.cpp deleted file mode 100644 index 37aa9b5..0000000 --- a/cmake/examples/static/bar.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include "bar.hpp" - -#include - -void bar() { - std::cout << "bar\n"; -} diff --git a/cmake/examples/static/bar.hpp b/cmake/examples/static/bar.hpp deleted file mode 100644 index a3ea4c1..0000000 --- a/cmake/examples/static/bar.hpp +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -void bar(); diff --git a/cmake/examples/static/foo.cpp b/cmake/examples/static/foo.cpp deleted file mode 100644 index c6355a2..0000000 --- a/cmake/examples/static/foo.cpp +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main() { - bar(); - return 0; -} -- cgit v1.2.3