From bd80edada3cdcc94ebbe6907eb202de1e9435075 Mon Sep 17 00:00:00 2001
From: devZoGok <nenkokeko@yandex.com>
Date: Mon, 5 Apr 2021 12:35:24 +0300
Subject: [PATCH] Cppunit is used as installed software

---
 .gitmodules      | 18 ------------------
 CMakeLists.txt   | 21 ++++++++++-----------
 external/CppUnit |  1 -
 external/glad    |  1 -
 4 files changed, 10 insertions(+), 31 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 external/CppUnit
 delete mode 160000 external/glad

diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 70abae8..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,18 +0,0 @@
-[submodule "external/glad"]
-	path = external/glad
-	url = https://github.com/Dav1dde/glad
-[submodule "external/glfw"]
-	path = external/glfw
-	url = https://github.com/glfw/glfw
-[submodule "external/glm"]
-	path = external/glm
-	url = https://github.com/g-truc/glm
-[submodule "external/freetype"]
-	path = external/freetype
-	url = https://gitlab.freedesktop.org/freetype/freetype
-[submodule "external/assimp"]
-	path = external/assimp
-	url = https://github.com/assimp/assimp
-[submodule "external/CppUnit"]
-	path = external/CppUnit
-	url = https://github.com/Ultimaker/CppUnit
diff --git a/CMakeLists.txt b/CMakeLists.txt
index aba1b5d..48c2092 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,6 +5,7 @@ set(CMAKE_BUILD_TYPE Debug)
 set(STB_HEADERS external/stb/)
 set(INCLUDE_DIR include/)
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread -pedantic")
+set(BUILD_SHARED_LIBS OFF)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
 cmake_policy(SET CMP0015 NEW)
@@ -23,6 +24,14 @@ include_directories(${STB_HEADERS})
 include_directories(external/glm)
 include_directories(external/glm/glm)
 
+if(UNIX)
+	include_directories(/usr/include/cppunit)
+	link_directories(/usr/lib)
+elseif(WIN32)
+	include_directories(C:/Program\ Files\ \(x86\)/cppunit/include)
+	link_directories(C:/Program\ Files\ \(x86\)/cppunit/lib)
+endif()
+
 add_library(${PROJECT_NAME} SHARED ${LIB_SRC})
 
 set(GLFW_DIR external/glfw)
@@ -59,7 +68,7 @@ add_subdirectory(${FREETYPE_DIR})
 target_include_directories(${PROJECT_NAME} PUBLIC ${FREETYPE_DIR}/include)
 target_link_directories(${PROJECT_NAME} PUBLIC ${FREETYPE_LIB_DIR})
 
-set(DEPS glfw3 assimp freetype ${CMAKE_DL_LIBS})
+set(DEPS glfw assimp freetype ${CMAKE_DL_LIBS})
 
 target_link_libraries(${PROJECT_NAME} ${DEPS})
 
@@ -70,14 +79,4 @@ set(ANIMATION_TEST animationChannelTest.cpp)
 set(TEST_SRC main.cpp ${LIB_SRC} ${RENDER_TEST} ${ARMATURE_TEST} ${MODEL_TEST} ${ANIMATION_TEST})
 
 add_executable(vb01Tests ${TEST_SRC})
-
-if(UNIX)
-	set(CPPUNIT_LIB_DIR build/${CPPUNIT_DIR})
-elseif(WIN32)
-	set(CPPUNIT_LIB_DIR build/${CPPUNIT_DIR}/Debug)
-endif()
-add_subdirectory(${CPPUNIT_DIR})
-target_include_directories(${PROJECT_NAME} PUBLIC ${CPPUNIT_DIR}/include)
-target_link_directories(${PROJECT_NAME} PUBLIC ${CPPUNIT_LIB_DIR})
-
 target_link_libraries(vb01Tests ${PROJECT_NAME} ${DEPS} cppunit)
diff --git a/external/CppUnit b/external/CppUnit
deleted file mode 160000
index a79b0e2..0000000
--- a/external/CppUnit
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a79b0e2674783ff4045e80fe0b193d6c4b860991
diff --git a/external/glad b/external/glad
deleted file mode 160000
index 7ece538..0000000
--- a/external/glad
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7ece538856bf124d798ab323c8e1e64ebb83cb50