Update json (@cgruber) and use My patched glfw

ChristopherHX · Nov 3, 2019 · d16ac07 · d16ac07
1 parent 1e4a59c
commit d16ac07
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ext/glfw.cmake b/ext/glfw.cmake
@@ -2,7 +2,7 @@ include(ExternalProject)
 
 ExternalProject_Add(
         glfw3_ext
-        URL "https://github.com/glfw/glfw/archive/master.zip"
+        URL "https://github.com/ChristopherHX/glfw/archive/master.zip"
         INSTALL_DIR ${CMAKE_BINARY_DIR}/ext/glfw
         CMAKE_ARGS "-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}/ext/glfw" "-DBUILD_SHARED_LIBS=OFF" "-DCMAKE_C_FLAGS=-m32" "-DCMAKE_LINK_FLAGS=-m32" "-DCMAKE_LIBRARY_ARCHITECTURE=${CMAKE_LIBRARY_ARCHITECTURE}"
 )

diff --git a/ext/json.cmake b/ext/json.cmake
@@ -2,7 +2,7 @@ include(ExternalProject)
 
 ExternalProject_Add(
         nlohmann_json_ext
-        URL "https://github.com/nlohmann/json/releases/download/v3.1.2/include.zip"
+        URL "https://github.com/nlohmann/json/releases/download/v3.7.0/include.zip"
         CONFIGURE_COMMAND "" BUILD_COMMAND "" INSTALL_DIR "" INSTALL_COMMAND ""
 )
 ExternalProject_Get_Property(nlohmann_json_ext SOURCE_DIR)