Converted project to cmake, making it somewhat portable

cdgiessen · Nov 12, 2018 · 66b9b75 · 66b9b75
1 parent 67b830f
commit 66b9b75
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 2 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -0,0 +1,33 @@
+cmake_minimum_required(VERSION 3.7 FATAL_ERROR)
+
+project(GraphicsProject4 VERSION 0.0.1 LANGUAGES CXX)
+
+find_package (OpenGL REQUIRED)
+find_package(GLEW REQUIRED)
+find_package(SOIL CONFIG REQUIRED)
+find_package(glfw3 REQUIRED)
+find_package(glm REQUIRED)
+
+add_executable(main 
+
+src/TerrainFPS.cpp
+src/GridFloatData.cpp
+)
+
+target_link_libraries(main PRIVATE ${OPENGL_LIBRARIES})
+
+target_include_directories(main PRIVATE GLEW)
+target_link_libraries(main PRIVATE GLEW::GLEW)
+
+target_link_libraries(main PRIVATE SOIL)
+
+target_link_libraries(main PUBLIC glm)
+
+target_include_directories(main PUBLIC glfw)
+target_link_libraries(main PRIVATE glfw)
+
+target_include_directories(main PRIVATE ${CMAKE_SOURCE_DIR}/src)
+
+add_custom_command(TARGET main POST_BUILD
+	COMMAND ${CMAKE_COMMAND} -E copy_directory
+		${PROJECT_SOURCE_DIR}/Resources $<TARGET_FILE_DIR:main>)
diff --git a/CMakeSettings.json b/CMakeSettings.json
@@ -0,0 +1,52 @@
+{
+  "configurations": [
+    {
+      "name": "x64-Debug",
+      "generator": "Ninja",
+      "configurationType": "Debug",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "variables": [
+        {
+          "name": "CMAKE_TOOLCHAIN_FILE",
+          "value": "C:/src/vcpkg/scripts/buildsystems/vcpkg.cmake"
+        }
+      ],
+      "ctestCommandArgs": ""
+    },
+    {
+      "name": "x64-RelWithDebInfo",
+      "generator": "Ninja",
+      "configurationType": "RelWithDebInfo",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "variables": [
+        {
+          "name": "CMAKE_TOOLCHAIN_FILE",
+          "value": "C:/src/vcpkg/scripts/buildsystems/vcpkg.cmake"
+        }
+      ],
+      "ctestCommandArgs": ""
+    },
+    {
+      "name": "x64-Release",
+      "generator": "Ninja",
+      "configurationType": "Release",
+      "inheritEnvironments": [ "msvc_x64_x64" ],
+      "buildRoot": "${env.USERPROFILE}\\CMakeBuilds\\${workspaceHash}\\build\\${name}",
+      "cmakeCommandArgs": "",
+      "buildCommandArgs": "-v",
+      "variables": [
+        {
+          "name": "CMAKE_TOOLCHAIN_FILE",
+          "value": "C:/src/vcpkg/scripts/buildsystems/vcpkg.cmake"
+        }
+      ],
+      "ctestCommandArgs": ""
+    }
+  ]
+}
diff --git a/TerrainFPS/Bullet.h → src/Bullet.h b/TerrainFPS/Bullet.h → src/Bullet.h
diff --git a/TerrainFPS/Camera.h → src/Camera.h b/TerrainFPS/Camera.h → src/Camera.h
diff --git a/TerrainFPS/GridFloatData.cpp → src/GridFloatData.cpp b/TerrainFPS/GridFloatData.cpp → src/GridFloatData.cpp
diff --git a/TerrainFPS/GridFloatData.h → src/GridFloatData.h b/TerrainFPS/GridFloatData.h → src/GridFloatData.h
diff --git a/TerrainFPS/SOIL.h → src/SOIL.h b/TerrainFPS/SOIL.h → src/SOIL.h
diff --git a/TerrainFPS/Shader.h → src/Shader.h b/TerrainFPS/Shader.h → src/Shader.h
diff --git a/TerrainFPS/TerrainFPS.cpp → src/TerrainFPS.cpp b/TerrainFPS/TerrainFPS.cpp → src/TerrainFPS.cpp
diff --git a/TerrainFPS/TerrainFPS.h → src/TerrainFPS.h b/TerrainFPS/TerrainFPS.h → src/TerrainFPS.h
@@ -6,7 +6,7 @@
 #include <iostream>
 
 // GLEW
-#define GLEW_STATIC
+//#define GLEW_STATIC
 #include <GL/glew.h>
 
 // GLFW
@@ -20,7 +20,7 @@
 // SOIL
 #include "SOIL.h"
 
-// Other includes
+// Other includes	
 #include "Shader.h"
 #include "Camera.h"
 #include "GridFloatData.h"