diff --git a/hecl/lib/Runtime/CMakeLists.txt b/hecl/lib/Runtime/CMakeLists.txt
index 90b839d70..e0e9326ad 100644
--- a/hecl/lib/Runtime/CMakeLists.txt
+++ b/hecl/lib/Runtime/CMakeLists.txt
@@ -1,4 +1,4 @@
 add_library(hecl-runtime
             FileStoreManager.cpp
-            ShaderCacheManager.cpp
-            HMDL.cpp)
+            ShaderCacheManager.cpp)
+add_library(hecl-hmdl HMDL.cpp)
diff --git a/hecl/test/CMakeLists.txt b/hecl/test/CMakeLists.txt
index 97c51ab98..c2d8b6502 100644
--- a/hecl/test/CMakeLists.txt
+++ b/hecl/test/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_executable(heclTest WIN32 main.cpp)
 target_link_libraries(heclTest
-    hecl-database hecl-runtime hecl-backend hecl-frontend hecl-blender hecl-common athena-core xxhash
+    hecl-database hecl-runtime hecl-backend hecl-frontend
+    hecl-hmdl hecl-blender hecl-common athena-core xxhash
     logvisor boo ${ZLIB_LIBRARIES} ${BOO_SYS_LIBS})