Merge pull request #20 from build-cpp/conditional-subdirs

Add support for conditional subdirs

CMakeLists.txt

@@ -53,8 +53,10 @@ add_subdirectory(tests)
 set(CMAKE_FOLDER ${CMKR_CMAKE_FOLDER})
 
 
+
 # Target cmkr
-unset(cmkr_SOURCES)
+set(CMKR_TARGET cmkr)
+set(cmkr_SOURCES "")
 
 list(APPEND cmkr_SOURCES
 	"src/args.cpp"
@@ -79,7 +81,12 @@ list(APPEND cmkr_SOURCES
 	cmake.toml
 )
 
-add_executable(cmkr ${cmkr_SOURCES})
+set(CMKR_SOURCES ${cmkr_SOURCES})
+add_executable(cmkr)
+
+if(cmkr_SOURCES)
+	target_sources(cmkr PRIVATE ${cmkr_SOURCES})
+endif()
 
 get_directory_property(CMKR_VS_STARTUP_PROJECT DIRECTORY ${PROJECT_SOURCE_DIR} DEFINITION VS_STARTUP_PROJECT)
 if(NOT CMKR_VS_STARTUP_PROJECT)
@@ -103,6 +110,8 @@ target_link_libraries(cmkr PRIVATE
 	ordered_map
 )
 
+unset(CMKR_TARGET)
+unset(CMKR_SOURCES)
 install(
 	TARGETS
 		cmkr

include/cmake.hpp

@@ -98,7 +98,7 @@ struct CMake {
     std::string build_dir = "build";
     std::string generator;
     std::string config;
-    std::vector<std::string> subdirs;
+    Condition<std::vector<std::string>> subdirs;
     std::vector<std::string> cppflags;
     std::vector<std::string> cflags;
     std::vector<std::string> linkflags;

src/gen.cpp

@@ -390,7 +390,9 @@ struct Generator {
                     cmd("if")(RawArg(cmake.conditions[condition]));
                 }
 
+                if (!itr.second.empty()) {
                     fn(condition, itr.second);
+                }
 
                 if (!condition.empty()) {
                     cmd("endif")();
@@ -573,7 +575,8 @@ int generate_cmake(const char *path, bool root) {
 
     // generate_cmake is called on the subdirectories recursively later
     if (!cmake.subdirs.empty()) {
-        for (const auto &dir : cmake.subdirs) {
+        gen.handle_condition(cmake.subdirs, [&](const std::string &, const std::vector<std::string> &subdirs) {
+            for (const auto &dir : subdirs) {
                 // clang-format off
                 comment(dir);
                 cmd("set")("CMKR_CMAKE_FOLDER", "${CMAKE_FOLDER}");
@@ -583,15 +586,19 @@ int generate_cmake(const char *path, bool root) {
                     cmd("set")("CMAKE_FOLDER", dir);
                 cmd("endif")();
                 // clang-format on
+
                 cmd("add_subdirectory")(dir);
                 cmd("set")("CMAKE_FOLDER", "${CMKR_CMAKE_FOLDER}").endl();
             }
+        });
         endl();
     }
 
     if (!cmake.targets.empty()) {
         for (const auto &target : cmake.targets) {
             comment("Target " + target.name);
+            cmd("set")("CMKR_TARGET", target.name);
+
             gen.handle_condition(target.include_before,
                                  [&](const std::string &, const std::vector<std::string> &includes) { inject_includes(includes); });
             gen.handle_condition(target.cmake_before, [&](const std::string &, const std::string &cmake) { inject_cmake(cmake); });
@@ -599,7 +606,7 @@ int generate_cmake(const char *path, bool root) {
             auto sources_var = target.name + "_SOURCES";
 
             bool added_toml = false;
-            cmd("unset")(sources_var).endl();
+            cmd("set")(sources_var, RawArg("\"\"")).endl();
             gen.handle_condition(target.sources, [&](const std::string &condition, const std::vector<std::string> &condition_sources) {
                 auto sources = expand_cmake_paths(condition_sources, path);
                 if (sources.empty()) {
@@ -616,6 +623,7 @@ int generate_cmake(const char *path, bool root) {
             if (!added_toml && target.type != cmake::target_interface) {
                 cmd("list")("APPEND", sources_var, std::vector<std::string>{"cmake.toml"}).endl();
             }
+            cmd("set")("CMKR_SOURCES", "${" + sources_var + "}");
 
             std::string add_command;
             std::string target_type;
@@ -656,7 +664,13 @@ int generate_cmake(const char *path, bool root) {
                 assert("Unimplemented enum value" && false);
             }
 
-            cmd(add_command)(target.name, target_type, "${" + target.name + "_SOURCES}").endl();
+            cmd(add_command)(target.name, target_type).endl();
+
+            // clang-format off
+            cmd("if")(sources_var);
+                cmd("target_sources")(target.name, target.type == cmake::target_interface ? "INTERFACE" : "PRIVATE", "${" + sources_var + "}");
+            cmd("endif")().endl();
+            // clang-format on
 
             // The first executable target will become the Visual Studio startup project
             if (target.type == cmake::target_executable) {
@@ -696,6 +710,9 @@ int generate_cmake(const char *path, bool root) {
             gen.handle_condition(target.include_after,
                                  [&](const std::string &, const std::vector<std::string> &includes) { inject_includes(includes); });
             gen.handle_condition(target.cmake_after, [&](const std::string &, const std::string &cmake) { inject_cmake(cmake); });
+
+            cmd("unset")("CMKR_TARGET");
+            cmd("unset")("CMKR_SOURCES");
         }
     }
 
@@ -755,11 +772,13 @@ int generate_cmake(const char *path, bool root) {
         }
     }
 
-    for (const auto &sub : cmake.subdirs) {
+    for (const auto &itr : cmake.subdirs) {
+        for (const auto &sub : itr.second) {
             auto subpath = fs::path(path) / fs::path(sub);
             if (fs::exists(subpath / "cmake.toml"))
                 generate_cmake(subpath.string().c_str(), false);
         }
+    }
 
     return 0;
 }

tests/CMakeLists.txt

@@ -28,3 +28,13 @@ add_test(
 		build
 )
 
+add_test(
+	NAME
+		interface
+	WORKING_DIRECTORY
+		"${CMAKE_CURRENT_LIST_DIR}/interface"
+	COMMAND
+		$<TARGET_FILE:cmkr>
+		build
+)
+

tests/cmake.toml

@@ -9,3 +9,9 @@ name = "conditions"
 command = "$<TARGET_FILE:cmkr>"
 working-directory = "${CMAKE_CURRENT_LIST_DIR}/conditions"
 arguments = ["build"]
+
+[[test]]
+name = "interface"
+command = "$<TARGET_FILE:cmkr>"
+working-directory = "${CMAKE_CURRENT_LIST_DIR}/interface"
+arguments = ["build"]

tests/interface/cmake.toml

@@ -0,0 +1,11 @@
+[project]
+name = "interface"
+
+[target.mylib]
+type = "interface"
+include-directories = ["include"]
+
+[target.example]
+type = "executable"
+sources = ["src/main.cpp"]
+link-libraries = ["mylib"]

tests/interface/include/mylib/mylib.hpp

@@ -0,0 +1,4 @@
+namespace mylib
+{
+static const char* version() { return "v1.0"; }
+} // namespace mylib

tests/interface/src/main.cpp

@@ -0,0 +1,8 @@
+#include <cstdio>
+
+#include "mylib/mylib.hpp"
+
+int main()
+{
+    printf("mylib version: %s\n", mylib::version())
+}