From 977b8f16d7ef43101b6ef588f9610f34285fa7e6 Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Wed, 20 Sep 2017 23:01:12 +0100
Subject: Replacing SDL by glfw

---
 lib/CMakeLists.txt | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

(limited to 'lib/CMakeLists.txt')

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 0f07326f..93f1bd1c 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -5,22 +5,29 @@
 # See file LICENSE for more details
 # ----------------------------------------------------------------------------
 
-if(${ENABLE_TESTING})
+if($ENV{UNIT_TESTS})
   # Initializing google test
   # prevents overriding the parent project's compiler/linter settings on windows
   set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+  set(BUILD_GTEST ON CACHE BOOL "" FORCE)
+  set(BUILD_GMOCK OFF CACHE BOOL "" FORCE)
 
   # Add googletest directly to our build. This defines
   # the gtest and gtest_main targets.
-  add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/googletest")
+  add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/googletest)
 
   # The gtest/gtest_main targets carry header search path
   # dependencies automatically when using CMake 2.8.11 or
   # later. Otherwise we have to add them here ourselves.
   if (CMAKE_VERSION VERSION_LESS 2.8.11)
-    include_directories("${gtest_SOURCE_DIR}/include")
+    include_directories(${gtest_SOURCE_DIR}/include)
   endif()
 endif()
 
-# include headers for rapidjson, no need to build it
-include_directories("${CMAKE_CURRENT_SOURCE_DIR}/rapidjson/include")
+include_directories(${rapidjson}/include)
+
+# setting up glfw
+set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
+set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
+set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glfw)
-- 
cgit 


From 8a78e678b7df0bf8221280f0058e2db0381b3ffa Mon Sep 17 00:00:00 2001
From: Yann Herklotz <ymherklotz@gmail.com>
Date: Thu, 21 Sep 2017 23:42:30 +0100
Subject: #11: Building, #10: Added GLFW

---
 lib/CMakeLists.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'lib/CMakeLists.txt')

diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
index 93f1bd1c..06d394d5 100644
--- a/lib/CMakeLists.txt
+++ b/lib/CMakeLists.txt
@@ -31,3 +31,5 @@ set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
 set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
 set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glfw)
+
+add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/glad)
-- 
cgit