chore: clean up cmake

Author: oktomus

.gitmodules

@@ -2,10 +2,6 @@
 	path = distant/imgui
 	url = https://github.com/ocornut/imgui.git
     ignore = dirty
-[submodule "distant/glfw"]
-	path = distant/glfw
-	url = https://github.com/glfw/glfw
-    ignore = dirty
 [submodule "distant/glm"]
 	path = distant/glm
 	url = https://github.com/g-truc/glm.git

CMakeLists.txt

@@ -14,41 +14,51 @@ set (CMAKE_CXX_STANDARD 14)
 set (CMAKE_CXX_STANDARD_REQUIRED ON)
 set (CMAKE_CXX_EXTENSIONS OFF)
 
-##################################################################################
-# Externals
-##################################################################################
+##############
+# Automatically managed dependencies
+#
+# glm and imgui are git submodules of this project.
+
+set(WEB_ROOT "${CMAKE_SOURCE_DIR}/distant/web")
 set(GLM_ROOT "${CMAKE_SOURCE_DIR}/distant/glm")
 set(IMGUI_ROOT "${CMAKE_SOURCE_DIR}/distant/imgui")
-set(WEB_ROOT "${CMAKE_SOURCE_DIR}/distant/web")
 
 set(GLM_INC "${GLM_ROOT}")
 set(IMGUI_INC "${IMGUI_ROOT}")
-set(GLFW_LOCATION "${CMAKE_SOURCE_DIR}/distant/glfw")
 
-if (NOT EXISTS ${GLFW_LOCATION} OR
-        NOT EXISTS ${GLM_INC} OR
-        NOT EXISTS ${IMGUI_INC}/examples)
-        message(STATUS "Updating submodules")
-        execute_process(COMMAND git submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
+if (NOT EXISTS ${GLM_INC} OR
+    NOT EXISTS ${IMGUI_INC}/examples)
+
+    message(STATUS "Updating submodules")
+
+    execute_process(COMMAND git submodule update --init --recursive WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 endif()
 
+# Copy imgui glfw implementation file.
+# As is, imgui use gl3w and we change it to use GLAD instead.
 if (NOT EXISTS ${IMGUI_ROOT}/imgui_impl_glfw_gl3.cpp OR
         NOT EXISTS ${IMGUI_ROOT}/imgui_impl_glfw_gl3.h)
+
     message(STATUS "Generating imgui glfw implementation files")
+
     file(COPY
         ${IMGUI_ROOT}/examples/opengl3_example/imgui_impl_glfw_gl3.cpp
         ${IMGUI_ROOT}/examples/opengl3_example/imgui_impl_glfw_gl3.h
         DESTINATION ${IMGUI_ROOT})
 
+    # I don't want imgui to use gl3w, I want it to use GLAD.
     message(STATUS "Replacing gl3w with glad in imgui implementation files")
     FILE(READ ${IMGUI_ROOT}/imgui_impl_glfw_gl3.cpp IMGUI_HEADER_STR)
-    # I don't want imgui to use gl3w, I want it to use GLAD.
     string(REPLACE "GL/gl3w.h" "glad/glad.h" IMGUI_HEADER_STR "${IMGUI_HEADER_STR}")
     FILE(WRITE ${IMGUI_ROOT}/imgui_impl_glfw_gl3.cpp "${IMGUI_HEADER_STR}")
 endif()
-
 file (GLOB IMGUI_SRC "${IMGUI_ROOT}/*.cpp")
 
+##############
+# Non-automatically managed dependencies
+#
+# This include: assimp, OpenGL and GLFW
+
 find_package(OpenGL REQUIRED)
 find_package(assimp REQUIRED)
 find_package(GLFW REQUIRED)
@@ -60,17 +70,11 @@ include_directories(
         ${ASSIMP_INCLUDE_DIR}
         ${IMGUI_INC}
         ${WEB_INC}
-        )
-
-
-##############
-# Build assets
-
-message(STATUS "Copy resources into ${CMAKE_CURRENT_BINARY_DIR}/resources")
-file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/resources" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+)
 
 ##############
 # Build glad lib
+
 set (glad_sources
     "${SRC_DIR}/thirdparty/glad/glad.c"
     "${SRC_DIR}/thirdparty/glad/glad.h"
@@ -90,6 +94,12 @@ install (TARGETS glad
     DESTINATION lib
 )
 
+##############
+# Build assets
+
+message(STATUS "Copy resources into ${CMAKE_CURRENT_BINARY_DIR}/resources")
+file(COPY "${CMAKE_CURRENT_SOURCE_DIR}/resources" DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
+
 ##############
 # Build core lib
 set (core_sources