Merge remote-tracking branch 'origin/master' into project_setup_refactor

# Conflicts:
#	CMakeLists.txt

3rdParty/CMakeLists.txt

@@ -1,5 +1,13 @@
 include(ExternalProject)
 
+if (CMAKE_TOOLCHAIN_FILE)
+    if(NOT IS_ABSOLUTE ${CMAKE_TOOLCHAIN_FILE})
+        set(TOOLCHAIN "${CMAKE_BINARY_DIR}/${CMAKE_TOOLCHAIN_FILE}")
+    else()
+        set(TOOLCHAIN "${CMAKE_TOOLCHAIN_FILE}")
+    endif()
+endif()
+
 add_subdirectory(glm)
 if (NOT ANDROID AND NOT IOS)
     add_subdirectory(glfw)
@@ -23,6 +31,7 @@ add_subdirectory(libarchive)
 add_subdirectory(boost)
 add_subdirectory(units)
 add_subdirectory(libjpeg-turbo)
+add_subdirectory(msdf)
 if (NOT IOS)
     add_subdirectory(curl)
 endif()