updates to install cmd

include/cppship/cmake/bin.h

@@ -30,4 +30,4 @@ class CmakeBin {
     BinDesc mDesc;
 };
 
-}
+}

include/cppship/cmake/dep.h

@@ -1,10 +1,10 @@
 #pragma once
 
-#include "cppship/core/dependency.h"
-
 #include <string>
 #include <vector>
 
+#include "cppship/core/dependency.h"
+
 namespace cppship::cmake {
 
 struct Dep {
@@ -16,4 +16,4 @@ struct Dep {
 std::vector<Dep> resolve_deps(
     const std::vector<DeclaredDependency>& declared_deps, const ResolvedDependencies& resolved);
 
-}
+}

include/cppship/cmake/dependency_injector.h

@@ -39,4 +39,4 @@ class CmakeDependencyInjector : public DependencyInjector {
     ResolvedDependencies mAllDeps;
 };
 
-}
+}

include/cppship/cmake/generator.h

@@ -71,4 +71,4 @@ class CmakeGenerator {
     std::set<std::string> mTestTargets;
 };
 
-}
+}

include/cppship/cmake/lib.h

@@ -38,4 +38,4 @@ class CmakeLib {
     std::vector<std::string> mDefinitions;
 };
 
-}
+}

include/cppship/cmake/msvc.h

@@ -9,4 +9,4 @@ namespace cppship::msvc {
 // msvc generator has different binary path, fix it
 fs::path fix_bin_path(const cppship::cmd::BuildContext& ctx, std::string_view bin);
 
-}
+}

include/cppship/cmake/package_configurer.h

@@ -1,9 +1,9 @@
 #pragma once
 
-#include "cppship/core/dependency.h"
-
 #include <functional>
 
+#include "cppship/core/dependency.h"
+
 namespace cppship::cmake {
 
 struct ConfigOptions {
@@ -17,4 +17,4 @@ struct ConfigOptions {
 void config_packages(
     const ResolvedDependencies& cppship_deps, const ResolvedDependencies& all_deps, const ConfigOptions& options);
 
-}
+}

include/cppship/cmd/build.h

@@ -72,4 +72,4 @@ void cmake_setup(const BuildContext& ctx);
 
 int cmake_build(const BuildContext& ctx, const BuildOptions& options);
 
-}
+}

include/cppship/cmd/cmake.h

@@ -6,4 +6,4 @@ struct CmakeOptions { };
 
 int run_cmake(const CmakeOptions& options);
 
-}
+}

include/cppship/cmd/init.h

@@ -18,4 +18,4 @@ struct InitOptions {
 
 int run_init(const InitOptions& options);
 
-}
+}

include/cppship/cmd/install.h

@@ -6,8 +6,9 @@ namespace cppship::cmd {
 
 struct InstallOptions {
     Profile profile = Profile::debug;
+    std::string root;
 };
 
 int run_install(const InstallOptions& options);
 
-}
+}

include/cppship/core/dependency.h

@@ -4,13 +4,13 @@
 #include <map>
 #include <string>
 #include <string_view>
-#include <toml/value.hpp>
 #include <variant>
 #include <vector>
 
 #include <fmt/core.h>
 #include <range/v3/view/map.hpp>
 #include <toml.hpp>
+#include <toml/value.hpp>
 
 #include "cppship/util/assert.h"
 #include "cppship/util/fs.h"

include/cppship/core/manifest.h

@@ -63,4 +63,4 @@ class Manifest {
 
 void generate_manifest(std::string_view name, CxxStd std, const fs::path& dir);
 
-}
+}

include/cppship/core/profile.h

@@ -72,4 +72,4 @@ struct ProfileOptions {
     std::vector<ConditionConfig> conditional_configs;
 };
 
-}
+}

include/cppship/core/resolver.h

@@ -1,14 +1,15 @@
 #pragma once
 
-#include "cppship/core/dependency.h"
-#include "cppship/core/manifest.h"
-
 #include <functional>
-#include <gsl/pointers>
 #include <queue>
 #include <set>
 #include <vector>
 
+#include <gsl/pointers>
+
+#include "cppship/core/dependency.h"
+#include "cppship/core/manifest.h"
+
 namespace cppship {
 
 struct ResolveResult {
@@ -45,4 +46,4 @@ class Resolver {
     std::set<std::string> mPackageSeen;
 };
 
-}
+}

include/cppship/util/assert.h

@@ -15,4 +15,4 @@ inline void enforce(bool expr, std::string_view msg)
     }
 }
 
-}
+}

include/cppship/util/fs.h

@@ -26,13 +26,9 @@ class ScopedCurrentDir {
     fs::path mPrevCwd;
 };
 
-inline void create_if_not_exist(const fs::path& path)
-{
-    if (fs::exists(path)) {
-        return;
-    }
+void create_if_not_exist(const fs::path& path);
 
-    fs::create_directory(path);
-}
+inline constexpr std::string_view kCppShipDirName = ".cppship";
+fs::path get_cppship_dir();
 
-}
+}

include/cppship/util/io.h

@@ -12,4 +12,4 @@ std::string read_as_string(const fs::path& file);
 
 std::string read_as_string(std::istream& iss);
 
-}
+}

lib/cmake/generator.cpp

@@ -1,12 +1,4 @@
 #include "cppship/cmake/generator.h"
-#include "cppship/cmake/bin.h"
-#include "cppship/cmake/cfg_predicate.h"
-#include "cppship/cmake/dep.h"
-#include "cppship/cmake/group.h"
-#include "cppship/cmake/lib.h"
-#include "cppship/cmake/naming.h"
-#include "cppship/core/manifest.h"
-#include "cppship/exception.h"
 
 #include <boost/algorithm/string/join.hpp>
 #include <boost/algorithm/string/replace.hpp>
@@ -19,6 +11,15 @@
 #include <range/v3/view/concat.hpp>
 #include <range/v3/view/transform.hpp>
 
+#include "cppship/cmake/bin.h"
+#include "cppship/cmake/cfg_predicate.h"
+#include "cppship/cmake/dep.h"
+#include "cppship/cmake/group.h"
+#include "cppship/cmake/lib.h"
+#include "cppship/cmake/naming.h"
+#include "cppship/core/manifest.h"
+#include "cppship/exception.h"
+
 using namespace ranges::views;
 
 using namespace cppship;
@@ -460,4 +461,4 @@ void CmakeGenerator::fill_profile_(Profile profile)
         appender.output(profile_str, config, "\t");
         mOut << "endif()\n\n";
     }
-}
+}

lib/cmake/msvc.cpp

@@ -1,8 +1,9 @@
 #include "cppship/cmake/msvc.h"
-#include "cppship/util/io.h"
 
 #include <boost/algorithm/string.hpp>
 
+#include "cppship/util/io.h"
+
 using namespace cppship;
 
 fs::path msvc::fix_bin_path(const cppship::cmd::BuildContext& ctx, std::string_view bin)
@@ -13,4 +14,4 @@ fs::path msvc::fix_bin_path(const cppship::cmd::BuildContext& ctx, std::string_v
     }
 
     return bin;
-}
+}

lib/cmake/package_configurer.cpp

@@ -1,13 +1,14 @@
 #include "cppship/cmake/package_configurer.h"
+
+#include <fmt/core.h>
+#include <fmt/format.h>
+
 #include "cppship/cmake/lib.h"
 #include "cppship/core/layout.h"
 #include "cppship/core/manifest.h"
 #include "cppship/util/io.h"
 #include "cppship/util/repo.h"
 
-#include <fmt/core.h>
-#include <fmt/format.h>
-
 using namespace cppship;
 using namespace fmt::literals;
 
@@ -27,7 +28,9 @@ void cmake::config_packages(
 add_library({target} INTERFACE IMPORTED)
 target_include_directories({target} INTERFACE {cmake_deps_dir}/{package}/include)
 )",
-                    "target"_a = cmake_target, "package"_a = dep.package, "cmake_deps_dir"_a = options.cmake_deps_dir));
+                    "target"_a = cmake_target,
+                    "package"_a = dep.package,
+                    "cmake_deps_dir"_a = options.cmake_deps_dir));
 
             continue;
         }
@@ -56,4 +59,4 @@ target_include_directories({target} INTERFACE {cmake_deps_dir}/{package}/include
 
         write(package_cmake_config_file, content);
     }
-}
+}

lib/cmd/bench.cpp

@@ -1,3 +1,5 @@
+#include "cppship/cmd/bench.h"
+
 #include <cstdlib>
 
 #include <boost/process/system.hpp>
@@ -8,7 +10,6 @@
 
 #include "cppship/cmake/msvc.h"
 #include "cppship/cmake/naming.h"
-#include "cppship/cmd/bench.h"
 #include "cppship/cmd/build.h"
 #include "cppship/core/manifest.h"
 #include "cppship/util/fs.h"
@@ -64,4 +65,4 @@ int cmd::run_bench(const BenchOptions& options)
     }
 
     return result;
-}
+}

lib/cmd/build.cpp

@@ -1,16 +1,4 @@
 #include "cppship/cmd/build.h"
-#include "cppship/cmake/generator.h"
-#include "cppship/cmake/group.h"
-#include "cppship/cmake/package_configurer.h"
-#include "cppship/core/compiler.h"
-#include "cppship/core/dependency.h"
-#include "cppship/core/resolver.h"
-#include "cppship/exception.h"
-#include "cppship/util/cmd.h"
-#include "cppship/util/fs.h"
-#include "cppship/util/git.h"
-#include "cppship/util/io.h"
-#include "cppship/util/log.h"
 
 #include <fstream>
 #include <sstream>
@@ -29,6 +17,19 @@
 #include <spdlog/spdlog.h>
 #include <toml.hpp>
 
+#include "cppship/cmake/generator.h"
+#include "cppship/cmake/group.h"
+#include "cppship/cmake/package_configurer.h"
+#include "cppship/core/compiler.h"
+#include "cppship/core/dependency.h"
+#include "cppship/core/resolver.h"
+#include "cppship/exception.h"
+#include "cppship/util/cmd.h"
+#include "cppship/util/fs.h"
+#include "cppship/util/git.h"
+#include "cppship/util/io.h"
+#include "cppship/util/log.h"
+
 using namespace cppship;
 using namespace boost::process;
 using namespace fmt::literals;
@@ -181,8 +182,10 @@ void cmd::conan_install(const BuildContext& ctx)
         return;
     }
 
-    const auto cmd = fmt::format("conan install {} -of {}/conan -pr {} --build=missing", ctx.build_dir.string(),
-        ctx.profile_dir.string(), ctx.conan_profile_path.string());
+    const auto cmd = fmt::format("conan install {} -of {}/conan -pr {} --build=missing",
+        ctx.build_dir.string(),
+        ctx.profile_dir.string(),
+        ctx.conan_profile_path.string());
 
     status("dependency", "install dependencies: {}", cmd);
     int res = run_cmd(cmd);
@@ -233,7 +236,8 @@ void cmd::cmake_setup(const BuildContext& ctx)
     const auto result = std::move(resolver).resolve();
 
     ResolvedDependencies deps = toml::get<ResolvedDependencies>(toml::parse(ctx.dependency_file));
-    CmakeGenerator gen(&ctx.layout, ctx.manifest,
+    CmakeGenerator gen(&ctx.layout,
+        ctx.manifest,
         GeneratorOptions {
             .deps = cmake::resolve_deps(result.dependencies, deps),
             .dev_deps = cmake::resolve_deps(result.dev_dependencies, deps),
@@ -242,7 +246,10 @@ void cmd::cmake_setup(const BuildContext& ctx)
 
     const std::string cmd = fmt::format("cmake -B {} -S build -DCMAKE_BUILD_TYPE={} -DCMAKE_EXPORT_COMPILE_COMMANDS=ON "
                                         "-DCONAN_GENERATORS_FOLDER={} -DCPPSHIP_DEPS_DIR={}",
-        ctx.profile_dir.string(), ctx.profile, (ctx.profile_dir / "conan").string(), ctx.deps_dir.string());
+        ctx.profile_dir.string(),
+        ctx.profile,
+        (ctx.profile_dir / "conan").string(),
+        ctx.deps_dir.string());
 
     status("config", "config cmake: {}", cmd);
     const int res = run_cmd(cmd);
@@ -291,7 +298,9 @@ std::string_view to_cmake_group(cmd::BuildGroup group, const std::string_view li
 
 int cmd::cmake_build(const BuildContext& ctx, const BuildOptions& options)
 {
-    auto cmd = fmt::format("cmake --build {} -j {} --config {}", ctx.profile_dir.string(), options.max_concurrency,
+    auto cmd = fmt::format("cmake --build {} -j {} --config {}",
+        ctx.profile_dir.string(),
+        options.max_concurrency,
         to_string(options.profile));
     if (options.target) {
         cmd += fmt::format(" --target {}", *options.target);
@@ -305,4 +314,4 @@ int cmd::cmake_build(const BuildContext& ctx, const BuildOptions& options)
 
     status("build", "{}", cmd);
     return run_cmd(cmd);
-}
+}