Directly link to freeimage library
This commit is contained in:
parent
8ac1a8d732
commit
742f77503b
|
@ -7,7 +7,11 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||||
# Define output directories for different configurations
|
# Define output directories for different configurations
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||||
|
|
||||||
|
if (WIN32)
|
||||||
|
set(VCPKG_ROOT "C:/users/jmchr/vcpkg")
|
||||||
|
else()
|
||||||
set(VCPKG_ROOT "/vcpkg")
|
set(VCPKG_ROOT "/vcpkg")
|
||||||
|
endif()
|
||||||
|
|
||||||
#include(C:/users/jmchr/vcpkg/scripts/buildsystems/vcpkg.cmake)
|
#include(C:/users/jmchr/vcpkg/scripts/buildsystems/vcpkg.cmake)
|
||||||
|
|
||||||
|
@ -62,7 +66,12 @@ include_directories(
|
||||||
)
|
)
|
||||||
|
|
||||||
# Link libraries using vcpkg
|
# 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
|
# Custom target for shaders
|
||||||
add_custom_target(copy_shaders ALL
|
add_custom_target(copy_shaders ALL
|
||||||
|
|
Loading…
Reference in New Issue