From 1af0b5f1cc723ac9659674ae22f950f5edecc44c Mon Sep 17 00:00:00 2001 From: Duncan Ogilvie Date: Wed, 31 Mar 2021 19:41:36 +0200 Subject: [PATCH] Add supporrt for cmkr-include --- src/cmkrlib/cmake.cpp | 1 + src/cmkrlib/cmake.hpp | 1 + src/cmkrlib/gen.cpp | 3 +-- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/cmkrlib/cmake.cpp b/src/cmkrlib/cmake.cpp index 3a64862..8c4e3f8 100644 --- a/src/cmkrlib/cmake.cpp +++ b/src/cmkrlib/cmake.cpp @@ -55,6 +55,7 @@ CMake::CMake(const std::string &path, bool build) { if (toml.contains("cmake")) { const auto &cmake = toml::find(toml, "cmake"); cmake_version = toml::find(cmake, "minimum").as_string(); + cmkr_include = toml::find_or(cmake, "cmkr-include", "cmkr.cmake"); cppflags = optional_array(cmake, "cpp-flags"); cflags = optional_array(cmake, "c-flags"); linkflags = optional_array(cmake, "link-flags"); diff --git a/src/cmkrlib/cmake.hpp b/src/cmkrlib/cmake.hpp index 97abbd4..1f9a46b 100644 --- a/src/cmkrlib/cmake.hpp +++ b/src/cmkrlib/cmake.hpp @@ -81,6 +81,7 @@ struct Install { struct CMake { std::string cmake_version; + std::string cmkr_include; std::string build_dir = "build"; std::string generator; std::string config; diff --git a/src/cmkrlib/gen.cpp b/src/cmkrlib/gen.cpp index ea287af..953df46 100644 --- a/src/cmkrlib/gen.cpp +++ b/src/cmkrlib/gen.cpp @@ -323,10 +323,9 @@ int generate_cmake(const char *path, bool root) { endl(); } - // TODO: make this a setting in the toml? if (root) { comment("Regenerate CMakeLists.txt file when necessary"); - cmd("include")("cmkr.cmake", "OPTIONAL", "RESULT_VARIABLE", "CMKR_INCLUDE_RESULT").endl(); + cmd("include")(cmake.cmkr_include, "OPTIONAL", "RESULT_VARIABLE", "CMKR_INCLUDE_RESULT").endl(); // clang-format off cmd("if")("CMKR_INCLUDE_RESULT");