From d2e859d35b36688322ede21b3103ce00cd0f1d24 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Thu, 22 Aug 2024 16:50:38 -0400 Subject: [PATCH] Test FreeImage inclusion --- CMakeLists.txt | 10 ++++++++-- source/scene.cpp | 2 ++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index abe7436..fa0e923 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -9,8 +9,12 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) if (WIN32) set(VCPKG_ROOT "C:/users/jmchr/vcpkg") + set(FreeImage_INCLUDE_DIR ${VCPKG_ROOT}/packages/freeimage_x64-windows/include) + set(FreeImage_LIBRARIES ${VCPKG_ROOT}/packages/freeimage_x64-windows/lib/FreeImage.lib) else() set(VCPKG_ROOT "/vcpkg") + set(FreeImage_INCLUDE_DIR ${VCPKG_ROOT}/packages/freeimage_x64-linux/include) + set(FreeImage_LIBRARIES ${VCPKG_ROOT}/packages/freeimage_x64-linux/lib/FreeImage.a) endif() #include(C:/users/jmchr/vcpkg/scripts/buildsystems/vcpkg.cmake) @@ -27,6 +31,7 @@ find_package(glm CONFIG REQUIRED) find_package(assimp CONFIG REQUIRED) find_package(FreeImage REQUIRED) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_DEBUG "${CMAKE_BINARY_DIR}") set(CMAKE_RUNTIME_OUTPUT_DIRECTORY_RELEASE "${CMAKE_BINARY_DIR}") @@ -62,10 +67,11 @@ add_executable(TerraVisor ${SOURCES} ${HEADERS} ${IMGUI_SOURCES}) include_directories( ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/imgui - ${CMAKE_SOURCE_DIR}/imgui/backends + ${CMAKE_SOURCE_DIR}/imgui/backends + ${FreeImage_INCLUDE_DIR} ) -target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp) +target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp ${FreeImage_LIBRARIES}) # Link libraries using vcpkg # Link the FreeImage library explicitly diff --git a/source/scene.cpp b/source/scene.cpp index 56da94b..60f1e7c 100644 --- a/source/scene.cpp +++ b/source/scene.cpp @@ -21,6 +21,8 @@ #include #include +#include + #include "scene.h" #include "camera.h" #include "Uniforms.h"