From 24253190c92c9d7ef669061670a3b7596f9ee190 Mon Sep 17 00:00:00 2001 From: Yann Herklotz Date: Fri, 22 Dec 2017 18:34:29 +0000 Subject: Changing directories and adding input support --- lib/CMakeLists.txt | 37 ------------------------------------- lib/glad | 1 - lib/glfw | 1 - lib/googletest | 1 - lib/rapidjson | 1 - 5 files changed, 41 deletions(-) delete mode 100644 lib/CMakeLists.txt delete mode 160000 lib/glad delete mode 160000 lib/glfw delete mode 160000 lib/googletest delete mode 160000 lib/rapidjson (limited to 'lib') diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt deleted file mode 100644 index 017e8206..00000000 --- a/lib/CMakeLists.txt +++ /dev/null @@ -1,37 +0,0 @@ -# ---------------------------------------------------------------------------- -# CMakeLists.txt -# -# Copyright (c) 2017 Yann Herklotz Grave -- MIT License -# See file LICENSE for more details -# ---------------------------------------------------------------------------- - -set(LIBRARY_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib) - -if(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(${LIBRARY_DIRECTORY}/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) - endif() -endif() - -include_directories(${LIBRARY_DIRECTORY}/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(${LIBRARY_DIRECTORY}/glfw) - -add_subdirectory(${LIBRARY_DIRECTORY}/glad) diff --git a/lib/glad b/lib/glad deleted file mode 160000 index 1e168396..00000000 --- a/lib/glad +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1e168396e9f457a26523a80a6ae704558413eb6b diff --git a/lib/glfw b/lib/glfw deleted file mode 160000 index 999f3556..00000000 --- a/lib/glfw +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 999f3556fdd80983b10051746264489f2cb1ef16 diff --git a/lib/googletest b/lib/googletest deleted file mode 160000 index d175c8bf..00000000 --- a/lib/googletest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit d175c8bf823e709d570772b038757fadf63bc632 diff --git a/lib/rapidjson b/lib/rapidjson deleted file mode 160000 index 5aa79b72..00000000 --- a/lib/rapidjson +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 5aa79b72721b7c8f8efa2fd65ae99912a67c9213 -- cgit