Merge pull request #5 from hrehfeld/master

fix: if cmake-project-build-directory is existing, use that instead of r...
alamaison · Dec 6, 2013 · 5754f60 · 5754f60
2 parents d7b3e14 + d3f0162
commit 5754f60
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/cmake-project.el b/cmake-project.el
@@ -221,8 +221,10 @@ build tools such as the CompileCommand and Flymake."
 
     (make-local-variable 'cmake-project-build-directory)
     (make-local-variable 'compile-command)
-
-    (cmake-project--changed-build-directory (cmake-project-find-build-directory))
+	(let ((build-directory (if cmake-project-build-directory
+							   cmake-project-build-directory
+							 (cmake-project-find-build-directory))))
+	  (cmake-project--changed-build-directory build-directory))
 
     (ad-enable-advice
      'flymake-get-file-name-mode-and-masks 'around 'cmake-flymake-advice)