From 1da102a8abb62be8c6474f61b9106c4d78239dfa Mon Sep 17 00:00:00 2001
From: eidheim <eidheim@gmail.com>
Date: Wed, 16 Dec 2015 16:59:03 +0100
Subject: [PATCH] Now setting PROJECT_NAME correctly even when using variables
 within project, and if these variables change after using the project
 function

---
 src/cmake.cc | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/cmake.cc b/src/cmake.cc
index 9c49e49..0ca58db 100644
--- a/src/cmake.cc
+++ b/src/cmake.cc
@@ -8,13 +8,10 @@
 CMake::CMake(const boost::filesystem::path &path) {
   const auto find_cmake_project=[this](const boost::filesystem::path &cmake_path) {
     for(auto &line: filesystem::read_lines(cmake_path)) {
-      const boost::regex project_regex("^ *project *\\( *([^ ]+).*\\) *$");
+      const boost::regex project_regex("^ *project *\\(.*$");
       boost::smatch sm;
-      if(boost::regex_match(line, sm, project_regex)) {
-        variables["CMAKE_PROJECT_NAME"]=sm[1].str(); //TODO: is this variable deprecated/non-standard?
-        variables["PROJECT_NAME"]=sm[1].str();
+      if(boost::regex_match(line, sm, project_regex))
         return true;
-      }
     }
     return false;
   };
@@ -142,8 +139,8 @@ void CMake::find_variables() {
         end_line=file.size();
       if(end_line>start_line) {
         auto line=file.substr(start_line, end_line-start_line);
-        const boost::regex set_regex("^ *set *\\( *([A-Za-z_][A-Za-z_0-9]*) +(.*)\\) *$");
         boost::smatch sm;
+        const boost::regex set_regex("^ *set *\\( *([A-Za-z_][A-Za-z_0-9]*) +(.*)\\) *$");
         if(boost::regex_match(line, sm, set_regex)) {
           auto data=sm[2].str();
           while(data.size()>0 && data.back()==' ')
@@ -151,6 +148,15 @@ void CMake::find_variables() {
           parse_variable_parameters(data);
           variables[sm[1].str()]=data;
         }
+        else {
+          const boost::regex project_regex("^ *project *\\( *([^ ]+).*\\) *$");
+          if(boost::regex_match(line, sm, project_regex)) {
+            auto data=sm[1].str();
+            parse_variable_parameters(data);
+            variables["CMAKE_PROJECT_NAME"]=data; //TODO: is this variable deprecated/non-standard?
+            variables["PROJECT_NAME"]=data;
+          }
+        }
       }
       pos=end_line+1;
     }