From 173c5e0f58814c807eab4e8400e3687b53153e89 Mon Sep 17 00:00:00 2001
From: Duncan Ogilvie <mr.exodia.tpodt@gmail.com>
Date: Fri, 5 Mar 2021 17:32:31 +0100
Subject: [PATCH] Restructure project

---
 CMakeLists.txt              |  40 ++++++++----
 cmake.toml                  |   4 +-
 cmake/CMakeLists.txt        |   4 +-
 include/literals.h          |  10 ++-
 src/{ => cmkrlib}/args.cpp  |   0
 src/{ => cmkrlib}/build.cpp |   0
 src/{ => cmkrlib}/cmake.cpp |   2 +-
 src/{ => cmkrlib}/cmake.hpp |   2 +-
 src/{ => cmkrlib}/error.cpp |   0
 src/{ => cmkrlib}/fs.hpp    |   0
 src/{ => cmkrlib}/gen.cpp   | 120 +++++++++++++++++++++---------------
 src/{ => cmkrlib}/help.cpp  |   0
 12 files changed, 110 insertions(+), 72 deletions(-)
 rename src/{ => cmkrlib}/args.cpp (100%)
 rename src/{ => cmkrlib}/build.cpp (100%)
 rename src/{ => cmkrlib}/cmake.cpp (99%)
 rename src/{ => cmkrlib}/cmake.hpp (97%)
 rename src/{ => cmkrlib}/error.cpp (100%)
 rename src/{ => cmkrlib}/fs.hpp (100%)
 rename src/{ => cmkrlib}/gen.cpp (75%)
 rename src/{ => cmkrlib}/help.cpp (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 04cbec4..3c2aff5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,61 +16,75 @@ project(cmkr VERSION ${cmkr_PROJECT_VERSION})
 
 include(FetchContent)
 
+message(STATUS "Fetching filesystem...")
 FetchContent_Declare(
 	filesystem
 	GIT_REPOSITORY https://github.com/gulrak/filesystem
 )
-
 FetchContent_MakeAvailable(filesystem)
 
+message(STATUS "Fetching mpark_variant...")
 FetchContent_Declare(
 	mpark_variant
 	URL https://github.com/mpark/variant/archive/v1.4.0.tar.gz
 )
-
 FetchContent_MakeAvailable(mpark_variant)
 
+message(STATUS "Fetching toml11...")
 FetchContent_Declare(
 	toml11
 	GIT_REPOSITORY https://github.com/ToruNiina/toml11
 )
-
 FetchContent_MakeAvailable(toml11)
 
 set(CMKRLIB_SOURCES
-	src/cmake.cpp
-	src/gen.cpp
-	src/help.cpp
-	src/build.cpp
-	src/error.cpp
+	src/cmkrlib/args.cpp
+	src/cmkrlib/build.cpp
+	src/cmkrlib/cmake.cpp
+	src/cmkrlib/error.cpp
+	src/cmkrlib/gen.cpp
+	src/cmkrlib/help.cpp
+	src/cmkrlib/cmake.hpp
+	src/cmkrlib/fs.hpp
+	include/args.h
+	include/build.h
+	include/error.h
+	include/gen.h
+	include/help.h
+	include/literals.h
+	cmake.toml
 )
 
 add_library(cmkrlib STATIC ${CMKRLIB_SOURCES})
 
+source_group(TREE ${PROJECT_SOURCE_DIR} FILES ${CMKRLIB_SOURCES})
+
 target_include_directories(cmkrlib PUBLIC
 	include
-	)
+)
 
 target_link_libraries(cmkrlib PUBLIC
 	toml11::toml11
 	ghc_filesystem
 	mpark_variant
-	)
+)
 
 target_compile_features(cmkrlib PUBLIC
 	cxx_std_11
-	)
+)
 
 set(CMKR_SOURCES
 	src/main.cpp
-	src/args.cpp
+	cmake.toml
 )
 
 add_executable(cmkr ${CMKR_SOURCES})
 
+source_group(TREE ${PROJECT_SOURCE_DIR} FILES ${CMKR_SOURCES})
+
 target_link_libraries(cmkr PUBLIC
 	cmkrlib
-	)
+)
 
 install(
 	TARGETS cmkr 
diff --git a/cmake.toml b/cmake.toml
index be05a27..65556fa 100644
--- a/cmake.toml
+++ b/cmake.toml
@@ -13,7 +13,7 @@ mpark_variant = { url = "https://github.com/mpark/variant/archive/v1.4.0.tar.gz"
 [[target]]
 name = "cmkrlib"
 type = "static"
-sources = ["src/cmake.cpp", "src/gen.cpp", "src/help.cpp", "src/build.cpp", "src/error.cpp"]
+sources = ["src/cmkrlib/*.cpp", "src/cmkrlib/*.hpp", "include/*.h"]
 include-directories = ["include"]
 compile-features = ["cxx_std_11"]
 link-libraries = ["toml11::toml11", "ghc_filesystem", "mpark_variant"]
@@ -21,7 +21,7 @@ link-libraries = ["toml11::toml11", "ghc_filesystem", "mpark_variant"]
 [[target]]
 name = "cmkr"
 type = "executable"
-sources = ["src/main.cpp", "src/args.cpp"]
+sources = ["src/main.cpp"]
 link-libraries = ["cmkrlib"]
 
 [[install]]
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index b460abd..c35b2dd 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -9,7 +9,6 @@ endif()
 
 cmake_minimum_required(VERSION 3.15)
 
-set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
 
 set(example_PROJECT_VERSION 0.1.0)
@@ -17,9 +16,12 @@ project(example VERSION ${example_PROJECT_VERSION})
 
 set(EXAMPLE_SOURCES
 	src/example.cpp
+	cmake.toml
 )
 
 add_executable(example ${EXAMPLE_SOURCES})
 
+source_group(TREE ${PROJECT_SOURCE_DIR} FILES ${EXAMPLE_SOURCES})
+
 
 
diff --git a/include/literals.h b/include/literals.h
index 8e63c4b..3859dfb 100644
--- a/include/literals.h
+++ b/include/literals.h
@@ -1,16 +1,15 @@
 #pragma once
 
-const char *hello_world = R"lit(
+static const char *hello_world = R"lit(
 #include <iostream>
 
 int %s() {
     std::cout << "Hello World!\n";
     return 0;
 }
+)lit" + 1; // skip initial newline
 
-)lit";
-
-const char *cmake_toml = R"lit(
+static const char *cmake_toml = R"lit(
 [cmake]
 minimum = "3.15"
 # subdirs = []
@@ -44,5 +43,4 @@ include-directories = ["include"]
 [[install]]
 %s = ["%s"]
 destination = "${CMAKE_INSTALL_PREFIX}/%s"
-
-)lit";
+)lit" + 1; // skip initial newline
diff --git a/src/args.cpp b/src/cmkrlib/args.cpp
similarity index 100%
rename from src/args.cpp
rename to src/cmkrlib/args.cpp
diff --git a/src/build.cpp b/src/cmkrlib/build.cpp
similarity index 100%
rename from src/build.cpp
rename to src/cmkrlib/build.cpp
diff --git a/src/cmake.cpp b/src/cmkrlib/cmake.cpp
similarity index 99%
rename from src/cmake.cpp
rename to src/cmkrlib/cmake.cpp
index ea3b80e..033f738 100644
--- a/src/cmake.cpp
+++ b/src/cmkrlib/cmake.cpp
@@ -218,7 +218,7 @@ CMake::CMake(const std::string &path, bool build) {
                     target.properties = toml::find<prop_map>(t, "properties");
                 }
 
-                binaries.push_back(target);
+                targets.push_back(target);
             }
         }
 
diff --git a/src/cmake.hpp b/src/cmkrlib/cmake.hpp
similarity index 97%
rename from src/cmake.hpp
rename to src/cmkrlib/cmake.hpp
index 22932be..f510eb8 100644
--- a/src/cmake.hpp
+++ b/src/cmkrlib/cmake.hpp
@@ -73,7 +73,7 @@ struct CMake {
     std::vector<Option> options;
     std::vector<Package> packages;
     std::map<std::string, std::map<std::string, std::string>> contents;
-    std::vector<Target> binaries;
+    std::vector<Target> targets;
     std::vector<Test> tests;
     std::vector<Install> installs;
     CMake(const std::string &path, bool build);
diff --git a/src/error.cpp b/src/cmkrlib/error.cpp
similarity index 100%
rename from src/error.cpp
rename to src/cmkrlib/error.cpp
diff --git a/src/fs.hpp b/src/cmkrlib/fs.hpp
similarity index 100%
rename from src/fs.hpp
rename to src/cmkrlib/fs.hpp
diff --git a/src/gen.cpp b/src/cmkrlib/gen.cpp
similarity index 75%
rename from src/gen.cpp
rename to src/cmkrlib/gen.cpp
index 0ade495..21baf6f 100644
--- a/src/gen.cpp
+++ b/src/cmkrlib/gen.cpp
@@ -40,14 +40,19 @@ std::string format(const char *fmt, Args... args) {
 
 static std::vector<std::string> expand_cmake_path(const fs::path &p) {
     std::vector<std::string> temp;
-    if (p.filename().stem().string() == "*") {
-        auto ext = p.extension();
-        for (const auto &f : fs::recursive_directory_iterator(
+    auto stem = p.filename().stem().string();
+    auto ext = p.extension();
+    if (stem == "*") {
+        for (const auto &f : fs::directory_iterator(
                  p.parent_path(), fs::directory_options::follow_directory_symlink)) {
-            if (f.is_directory()) {
-                continue;
+            if (!f.is_directory() && f.path().extension() == ext) {
+                temp.push_back(f.path().string());
             }
-            if (f.path().extension() == ext) {
+        }
+    } else if (stem == "**") {
+        for (const auto &f : fs::recursive_directory_iterator(
+                 p.parent_path(), fs::directory_options::follow_directory_symlink)) {
+            if (!f.is_directory() && f.path().extension() == ext) {
                 temp.push_back(f.path().string());
             }
         }
@@ -193,6 +198,7 @@ int generate_cmake(const char *path) {
         if (!cmake.contents.empty()) {
             ss << "include(FetchContent)\n\n";
             for (const auto &dep : cmake.contents) {
+                ss << "message(STATUS \"Fetching " << dep.first << "...\")\n";
                 ss << "FetchContent_Declare(\n\t" << dep.first << "\n";
                 for (const auto &arg : dep.second) {
                     std::string first_arg = arg.first;
@@ -213,7 +219,7 @@ int generate_cmake(const char *path) {
                     }
                     ss << "\t" << first_arg << " " << arg.second << "\n";
                 }
-                ss << ")\n\n"
+                ss << ")\n"
                    << "FetchContent_MakeAvailable(" << dep.first << ")\n\n";
             }
         }
@@ -249,87 +255,98 @@ int generate_cmake(const char *path) {
             }
         }
 
-        if (!cmake.binaries.empty()) {
-            for (const auto &bin : cmake.binaries) {
-                std::string bin_type;
+        if (!cmake.targets.empty()) {
+            for (const auto &target : cmake.targets) {
                 std::string add_command;
-                if (bin.type == "executable") {
-                    bin_type = "";
+                std::string target_type;
+                if (target.type == "executable") {
                     add_command = "add_executable";
-                } else if (bin.type == "shared" || bin.type == "static" ||
-                           bin.type == "interface") {
-                    bin_type = detail::to_upper(bin.type);
+                    target_type = "";
+                } else if (target.type == "shared" || target.type == "static" ||
+                           target.type == "interface") {
                     add_command = "add_library";
-                } else if (bin.type == "library") {
-                    bin_type = "";
+                    target_type = detail::to_upper(target.type);
+                } else if (target.type == "library") {
                     add_command = "add_library";
+                    target_type = "";
                 } else {
                     throw std::runtime_error(
-                        "Unknown binary type " + bin.type +
+                        "Unknown binary type " + target.type +
                         "! Supported types are: executable, library, shared, static, interface");
                 }
 
-                if (!bin.sources.empty()) {
-                    ss << "set(" << detail::to_upper(bin.name) << "_SOURCES\n";
-                    for (const auto &src : bin.sources) {
+                if (!target.sources.empty()) {
+                    ss << "set(" << detail::to_upper(target.name) << "_SOURCES\n";
+                    int sources_added = 0;
+                    for (const auto &src : target.sources) {
                         auto path = fs::path(src);
                         auto expanded = detail::expand_cmake_path(path);
                         for (const auto &f : expanded) {
                             ss << "\t" << f << "\n";
+                            sources_added++;
                         }
                     }
+                    if (sources_added == 0) {
+                        throw std::runtime_error(target.name + " sources wildcard found 0 files");
+                    }
+                    if (target.type != "interface") {
+                        ss << "\tcmake.toml\n";
+                    }
                     ss << ")\n\n";
                 }
 
-                ss << add_command << "(" << bin.name;
-                if (!bin_type.empty())
-                    ss << " " << bin_type;
+                ss << add_command << "(" << target.name;
+                if (!target_type.empty()) {
+                    ss << " " << target_type;
+                }
 
-                if (!bin.sources.empty()) {
-                    ss << " ${" << detail::to_upper(bin.name) << "_SOURCES})\n\n";
+                if (!target.sources.empty()) {
+                    ss << " ${" << detail::to_upper(target.name) << "_SOURCES})\n\n";
+                    ss << "source_group(TREE ${PROJECT_SOURCE_DIR} FILES ${"
+                       << detail::to_upper(target.name) << "_SOURCES})\n\n";
                 } else {
                     ss << ")\n\n";
                 }
 
-                if (!bin.alias.empty()) {
-                    ss << "add_library(" << bin.alias << " ALIAS " << bin.name << ")\n\n";
+                if (!target.alias.empty()) {
+                    ss << "add_library(" << target.alias << " ALIAS " << target.name << ")\n\n";
                 }
 
-                if (!bin.include_directories.empty()) {
-                    ss << "target_include_directories(" << bin.name << " PUBLIC\n\t";
-                    for (const auto &inc : bin.include_directories) {
-                        ss << fs::path(inc).string() << "\n\t";
+                if (!target.include_directories.empty()) {
+                    ss << "target_include_directories(" << target.name << " PUBLIC\n";
+                    for (const auto &inc : target.include_directories) {
+                        ss << "\t" << inc << "\n";
                     }
                     ss << ")\n\n";
                 }
 
-                if (!bin.link_libraries.empty()) {
-                    ss << "target_link_libraries(" << bin.name << " PUBLIC\n\t";
-                    for (const auto &l : bin.link_libraries) {
-                        ss << l << "\n\t";
+                if (!target.link_libraries.empty()) {
+                    ss << "target_link_libraries(" << target.name << " PUBLIC\n";
+                    for (const auto &l : target.link_libraries) {
+                        ss << "\t" << l << "\n";
                     }
                     ss << ")\n\n";
                 }
 
-                if (!bin.compile_features.empty()) {
-                    ss << "target_compile_features(" << bin.name << " PUBLIC\n\t";
-                    for (const auto &feat : bin.compile_features) {
-                        ss << feat << "\n\t";
+                if (!target.compile_features.empty()) {
+                    ss << "target_compile_features(" << target.name << " PUBLIC\n";
+                    for (const auto &feat : target.compile_features) {
+                        ss << "\t" << feat << "\n";
                     }
                     ss << ")\n\n";
                 }
 
-                if (!bin.compile_definitions.empty()) {
-                    ss << "target_add_definitions(" << bin.name << " PUBLIC\n\t";
-                    for (const auto &def : bin.compile_definitions) {
-                        ss << def << "\n\t";
+                if (!target.compile_definitions.empty()) {
+                    ss << "target_compile_definitions(" << target.name << " PUBLIC\n";
+                    for (const auto &def : target.compile_definitions) {
+                        ss << "\t" << def << "\n";
                     }
                     ss << ")\n\n";
                 }
 
-                if (!bin.properties.empty()) {
-                    ss << "set_target_properties(" << bin.name << " PROPERTIES\n";
-                    for (const auto &prop : bin.properties) {
+                if (!target.properties.empty()) {
+                    ss << "set_target_properties(" << target.name << " PROPERTIES\n";
+                    for (const auto &prop : target.properties) {
                         ss << "\t" << prop.first << " " << prop.second << "\n";
                     }
                     ss << ")\n\n";
@@ -368,10 +385,17 @@ int generate_cmake(const char *path) {
                 }
                 if (!inst.files.empty()) {
                     ss << "\tFILES ";
+                    int files_added = 0;
                     for (const auto &file : inst.files) {
                         auto path = detail::expand_cmake_path(fs::path(file));
-                        for (const auto &f : path)
+                        for (const auto &f : path) {
                             ss << f << " ";
+                            files_added++;
+                        }
+                    }
+                    if (files_added == 0) {
+                        throw std::runtime_error(
+                            "[[install]] files wildcard did not resolve to any files");
                     }
                 }
                 if (!inst.configs.empty()) {
diff --git a/src/help.cpp b/src/cmkrlib/help.cpp
similarity index 100%
rename from src/help.cpp
rename to src/cmkrlib/help.cpp