Merge pull request #200 from de-ep/gitignore-CMKR_BUILD_DIR

Automatically create .gitignore in CMAKE_BINARY_DIR

cmake/cmkr.cmake

@@ -10,6 +10,7 @@ if(CMAKE_SCRIPT_MODE_FILE)
     set(CMAKE_BINARY_DIR "${CMAKE_BINARY_DIR}/build")
     set(CMAKE_CURRENT_BINARY_DIR "${CMAKE_BINARY_DIR}")
     file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}")
+    file(WRITE "${CMAKE_BINARY_DIR}/.gitignore" "# This file is autogenerated by cmkr.\n*\n")
 endif()
 
 # Set these from the command line to customize for development/debugging purposes

src/cmake_generator.cpp

@@ -255,7 +255,13 @@ void generate_project(const std::string &type) {
     generate_gitfile(".gitattributes", {"/**/CMakeLists.txt linguist-generated", "/**/cmkr.cmake linguist-vendored"});
 
     // Generate .gitignore with reasonable defaults for CMake
-    generate_gitfile(".gitignore", {"build*/", "cmake-build*/", "CMakerLists.txt", "CMakeLists.txt.user"});
+    generate_gitfile(".gitignore", {
+                                       "build*/",
+                                       "cmake-build*/",
+                                       "CMakerLists.txt",
+                                       "CMakeLists.txt.user",
+                                       "CMakeUserPresets.json",
+                                   });
 
     tsl::ordered_map<std::string, std::string> variables = {
         {"@name", name},

src/project_parser.cpp

@@ -445,18 +445,19 @@ Project::Project(const Project *parent, const std::string &path, bool build) : p
             options.push_back(o);
 
             // Add a condition matching the option name
-            conditions.emplace(o.name, o.name);
+            if (!conditions.emplace(o.name, o.name).second) {
+                print_key_warning("Option '" + o.name + "' would create a condition '" + o.name + "' that already exists", o.name, value);
+            }
 
             // Add an implicit condition for the option
             auto ncondition = normalize(o.name);
             if (ncondition.find(nproject_prefix) == 0) {
                 ncondition = ncondition.substr(nproject_prefix.size());
             }
-            if (!ncondition.empty()) {
-                if (conditions.contains(ncondition)) {
+            if (!ncondition.empty() && ncondition != o.name) {
+                if (!conditions.emplace(ncondition, o.name).second) {
                     print_key_warning("Option '" + o.name + "' would create a condition '" + ncondition + "' that already exists", o.name, value);
                 }
-                conditions.emplace(ncondition, o.name);
             }
         }
     }