diff --git a/CMakeLists.txt b/CMakeLists.txt
index 165e00e..fdbb6ac 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,9 +23,10 @@ set(PROJECT_VERSION "${CURRENT_YEAR}.${CURRENT_MONTH}${CURRENT_DAY}.${CURRENT_HO
 string(TIMESTAMP RELEASE_DATE "%Y-%m-%d")
 
 # Configure version.hpp file
-file(GENERATE
-    OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/src/version.hpp"
-    INPUT "${CMAKE_CURRENT_SOURCE_DIR}/src/version.hpp.in"
+configure_file(
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/version.hpp.in"
+    "${CMAKE_CURRENT_BINARY_DIR}/src/version.hpp"
+    @ONLY
 )
 
 # Set CMAKE_MODULE_PATH to include our custom find modules
@@ -39,12 +40,13 @@ file(GLOB_RECURSE HEADERS "src/*.hpp")
 add_executable(dropshell ${SOURCES})
 
 # Set include directories
+# build dir goes first so that we can use the generated version.hpp
 target_include_directories(dropshell PRIVATE 
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
     ${CMAKE_CURRENT_SOURCE_DIR}/src
     ${CMAKE_CURRENT_SOURCE_DIR}/src/utils
     ${CMAKE_CURRENT_SOURCE_DIR}/src/contrib
     ${CMAKE_CURRENT_SOURCE_DIR}/src/commands
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_BINARY_DIR}/src>
 )
 
 include(FetchContent)