diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
index 8e918de0..5dbc0dd1 100644
--- a/source/CMakeLists.txt
+++ b/source/CMakeLists.txt
@@ -148,6 +148,7 @@ add_custom_command(OUTPUT ${SPIRV_TOOLS_BUILD_VERSION_INC}
    DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC_GENERATOR}
            ${SPIRV_TOOLS_CHANGES_FILE}
    COMMENT "Update build-version.inc in the SPIRV-Tools build directory (if necessary).")
+add_custom_target(build_version DEPENDS ${SPIRV_TOOLS_BUILD_VERSION_INC})
 
 list(APPEND PCH_DEPENDS
 	${CORE_TABLES_HEADER_INC_FILE}
@@ -334,7 +335,7 @@ function(spirv_tools_default_target_options target)
   )
   set_property(TARGET ${target} PROPERTY FOLDER "SPIRV-Tools libraries")
   spvtools_check_symbol_exports(${target})
-  add_dependencies(${target} core_tables extinst_tables)
+  add_dependencies(${target} core_tables extinst_tables build_version)
 endfunction()
 
 # Always build ${SPIRV_TOOLS}-shared. This is expected distro packages, and
diff --git a/source/opt/CMakeLists.txt b/source/opt/CMakeLists.txt
index a0ca5b84..a6dd3f68 100644
--- a/source/opt/CMakeLists.txt
+++ b/source/opt/CMakeLists.txt
@@ -283,6 +283,8 @@ target_include_directories(SPIRV-Tools-opt
 target_link_libraries(SPIRV-Tools-opt
   PUBLIC ${SPIRV_TOOLS_FULL_VISIBILITY})
 
+add_dependencies(SPIRV-Tools-opt core_tables)
+
 set_property(TARGET SPIRV-Tools-opt PROPERTY FOLDER "SPIRV-Tools libraries")
 spvtools_check_symbol_exports(SPIRV-Tools-opt)