diff --git a/CMakeLists.txt b/CMakeLists.txt
index 31a5928a4f..283424ee2a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -134,17 +134,16 @@ EXECUTE_PROCESS(
   OUTPUT_STRIP_TRAILING_WHITESPACE
 )
 
-if (NOT DEFINED BUILDING_FROM_VCS)
-    set (BUILDING_FROM_VCS "NO")
-    if (GNC_VCS_INFO_RESULT EQUAL 0)
-        set (BUILDING_FROM_VCS "YES")
-        # IF building from VCS, we need git
-        find_package (Git)
-        if (NOT GIT_FOUND)
-            message (SEND_ERROR "Looks like we're building from version control, but can't find git executable. Please set GIT_EXECUTABLE.")
-        endif()
-    endif()
-endif()
+SET(BUILDING_FROM_VCS "NO")
+IF (GNC_VCS_INFO_RESULT EQUAL 0)
+  SET(BUILDING_FROM_VCS "YES")
+  # IF building from VCS, we need git
+  find_package(Git)
+  IF (NOT GIT_FOUND)
+    MESSAGE(SEND_ERROR "Looks like we're building from version control, but can't find git executable. Please set GIT_EXECUTABLE.")
+  ENDIF()
+ENDIF()
+
 
 
 IF (WIN32)