From 742f77503b47fb1b914a16e8bdabd9e756d88106 Mon Sep 17 00:00:00 2001 From: Jack Christensen Date: Mon, 19 Aug 2024 15:20:26 -0400 Subject: [PATCH] Directly link to freeimage library --- CMakeLists.txt | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f1447b7..5106dac 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,7 +7,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON) # Define output directories for different configurations set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}) -set(VCPKG_ROOT "/vcpkg") +if (WIN32) + set(VCPKG_ROOT "C:/users/jmchr/vcpkg") +else() + set(VCPKG_ROOT "/vcpkg") +endif() #include(C:/users/jmchr/vcpkg/scripts/buildsystems/vcpkg.cmake) @@ -62,7 +66,12 @@ include_directories( ) # Link libraries using vcpkg -target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp FreeImage) +# Link the FreeImage library explicitly +if (WIN32) + target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp "${VCPKG_ROOT}/installed/x64-windows/lib/FreeImage.lib") +else() + target_link_libraries(TerraVisor PRIVATE GLEW::GLEW glfw glm::glm assimp::assimp FreeImage "${VCPKG_ROOT}/installed/x64-linux/lib/libFreeImage.a") +endif() # Custom target for shaders add_custom_target(copy_shaders ALL