diff --git a/cmake/bimg/3rdparty/edtaa3.cmake b/cmake/bimg/3rdparty/edtaa3.cmake
new file mode 100644
index 0000000..8b24397
--- /dev/null
+++ b/cmake/bimg/3rdparty/edtaa3.cmake
@@ -0,0 +1,25 @@
+# bgfx.cmake - bgfx building in cmake
+# Written in 2017 by Joshua Brookover <joshua.al.brookover@gmail.com>
+#
+# To the extent possible under law, the author(s) have dedicated all copyright
+# and related and neighboring rights to this software to the public domain
+# worldwide. This software is distributed without any warranty.
+#
+# 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/>.
+
+# Ensure the directory exists
+if(NOT IS_DIRECTORY ${BIMG_DIR})
+	message(SEND_ERROR "Could not load bimg, directory does not exist. ${BIMG_DIR}")
+	return()
+endif()
+
+if(NOT EDTAA3_LIBRARIES)
+	file(
+		GLOB_RECURSE #
+		EDTAA3_SOURCES #
+		${BIMG_DIR}/3rdparty/edtaa3/**.cpp #
+		${BIMG_DIR}/3rdparty/edtaa3/**.h #
+	)
+	set(EDTAA3_INCLUDE_DIR ${BIMG_DIR}/3rdparty)
+endif()
diff --git a/cmake/bimg/CMakeLists.txt b/cmake/bimg/CMakeLists.txt
index cceb22a..7e605b8 100644
--- a/cmake/bimg/CMakeLists.txt
+++ b/cmake/bimg/CMakeLists.txt
@@ -11,6 +11,7 @@
 include(3rdparty/loadpng.cmake)
 include(3rdparty/libsquish.cmake)
 include(3rdparty/astc_encoder.cmake)
+include(3rdparty/edtaa3.cmake)
 include(3rdparty/etc1.cmake)
 include(3rdparty/etc2.cmake)
 include(3rdparty/nvtt.cmake)
diff --git a/cmake/bimg/bimg_encode.cmake b/cmake/bimg/bimg_encode.cmake
index 5702bc3..8f7ae94 100644
--- a/cmake/bimg/bimg_encode.cmake
+++ b/cmake/bimg/bimg_encode.cmake
@@ -22,13 +22,13 @@ set_target_properties(bimg_encode PROPERTIES FOLDER "bgfx")
 target_include_directories(
 	bimg_encode
 	PUBLIC $<BUILD_INTERFACE:${BIMG_DIR}/include> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
-	PRIVATE ${BIMG_DIR}/3rdparty #
-			${LIBSQUISH_INCLUDE_DIR} #
-			${ASTC_ENCODER_INCLUDE_DIR}
-			${ETC1_INCLUDE_DIR}
-			${ETC2_INCLUDE_DIR}
+	PRIVATE ${LIBSQUISH_INCLUDE_DIR} #
+			${ASTC_ENCODER_INCLUDE_DIR} #
+			${EDTAA3_INCLUDE_DIR} #
+			${ETC1_INCLUDE_DIR} #
+			${ETC2_INCLUDE_DIR} #
 			${NVTT_INCLUDE_DIR} #
-			${PVRTC_INCLUDE_DIR}
+			${PVRTC_INCLUDE_DIR} #
 			${TINYEXR_INCLUDE_DIR} #
 			${IQA_INCLUDE_DIR} #
 			${MINIZ_INCLUDE_DIR} #
@@ -41,8 +41,7 @@ file(
 	${BIMG_DIR}/src/image_encode.* #
 	${BIMG_DIR}/src/image_cubemap_filter.* #
 	${LIBSQUISH_SOURCES} #
-	${BIMG_DIR}/3rdparty/edtaa3/**.cpp #
-	${BIMG_DIR}/3rdparty/edtaa3/**.h #
+	${EDTAA3_SOURCES} #
 	${ETC1_SOURCES} #
 	${ETC2_SOURCES} #
 	${NVTT_SOURCES} #
@@ -58,9 +57,10 @@ target_link_libraries(
 	PUBLIC bx #
 		   ${LIBSQUISH_LIBRARIES} #
 		   ${ASTC_ENCODER_LIBRARIES} #
+		   ${EDTAA3_LIBRARIES} #
 		   ${ETC1_LIBRARIES} #
 		   ${ETC2_LIBRARIES} #
-		   ${NVTT_LIBRARIES}
+		   ${NVTT_LIBRARIES} #
 		   ${PVRTC_LIBRARIES} #
 		   ${TINYEXR_LIBRARIES} #
 		   ${IQA_LIBRARIES} #