Test FreeImage inclusion
This commit is contained in:
parent
59bd0c30b1
commit
d2e859d35b
|
@ -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
|
||||
|
|
|
@ -21,6 +21,8 @@
|
|||
#include <cstdint>
|
||||
#include <algorithm>
|
||||
|
||||
#include <FreeImage.h>
|
||||
|
||||
#include "scene.h"
|
||||
#include "camera.h"
|
||||
#include "Uniforms.h"
|
||||
|
|
Loading…
Reference in New Issue