diff --git a/cmake/bgfx/CMakeLists.txt b/cmake/bgfx/CMakeLists.txt
index be39402..805820b 100644
--- a/cmake/bgfx/CMakeLists.txt
+++ b/cmake/bgfx/CMakeLists.txt
@@ -13,3 +13,6 @@ include(bgfx.cmake)
 if(BGFX_BUILD_TOOLS_TEXTURE)
 	include(texturev.cmake)
 endif()
+if(BGFX_BUILD_TOOLS_GEOMETRY)
+	include(geometryv.cmake)
+endif()
diff --git a/cmake/tools/geometryv.cmake b/cmake/bgfx/geometryv.cmake
similarity index 77%
rename from cmake/tools/geometryv.cmake
rename to cmake/bgfx/geometryv.cmake
index fb0bfce..c8a434d 100644
--- a/cmake/tools/geometryv.cmake
+++ b/cmake/bgfx/geometryv.cmake
@@ -8,16 +8,23 @@
 # You should have received a copy of the CC0 Public Domain Dedication along with
 # this software. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
 
-add_executable(geometryv ${BGFX_DIR}/tools/geometryv/geometryv.cpp)
-set_target_properties(geometryv PROPERTIES FOLDER "bgfx/tools")
+add_executable(geometryv)
+
+# Grab the geometryv source files
+file(GLOB_RECURSE GEOMETRYV_SOURCES #
+	 ${BGFX_DIR}/tools/geometryv/*
+)
+
+target_sources(geometryv PRIVATE ${GEOMETRYV_SOURCES})
 target_link_libraries(geometryv example-common)
-if(EMSCRIPTEN)
-	target_link_options(geometryv PRIVATE -sMAX_WEBGL_VERSION=2)
-endif()
-if(BGFX_CUSTOM_TARGETS)
+set_target_properties(geometryv PROPERTIES FOLDER "bgfx/tools")
+
+if(BGFX_BUILD_TOOLS AND BGFX_CUSTOM_TARGETS)
 	add_dependencies(tools geometryv)
 endif()
 
-if(IOS)
+if(EMSCRIPTEN)
+	target_link_options(geometryv PRIVATE -sMAX_WEBGL_VERSION=2)
+elseif(IOS)
 	set_target_properties(geometryv PROPERTIES MACOSX_BUNDLE ON MACOSX_BUNDLE_GUI_IDENTIFIER geometryv)
 endif()
diff --git a/cmake/tools.cmake b/cmake/tools.cmake
index 959c28e..185d8bf 100644
--- a/cmake/tools.cmake
+++ b/cmake/tools.cmake
@@ -14,5 +14,4 @@ endif()
 
 if(BGFX_BUILD_TOOLS_GEOMETRY)
 	include(${CMAKE_CURRENT_LIST_DIR}/tools/geometryc.cmake)
-	include(${CMAKE_CURRENT_LIST_DIR}/tools/geometryv.cmake)
 endif()