From 473aedcdad667492e4071db56c89550e0281d0e8 Mon Sep 17 00:00:00 2001 From: Tanguy Fautre Date: Thu, 11 Apr 2024 18:44:19 +0100 Subject: [PATCH] Revert tinyobjloader cmake changes. Likely a cmake regression according to https://github.com/microsoft/vcpkg/issues/37968 --- CMakeLists.txt | 2 +- src/CMakeLists.txt | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f4f23010..31633f99 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,7 @@ find_package(glfw3 REQUIRED) find_package(glm CONFIG REQUIRED) find_package(imgui CONFIG REQUIRED) find_package(Stb REQUIRED) -#find_package(tinyobjloader CONFIG REQUIRED) +find_package(tinyobjloader CONFIG REQUIRED) find_package(Vulkan REQUIRED) #add_definitions(-DIMGUI_DISABLE_OBSOLETE_FUNCTIONS) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index dc619e8e..89960217 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -157,5 +157,4 @@ add_dependencies(${exe_name} Assets) set_target_properties(${exe_name} PROPERTIES DEBUG_POSTFIX ${CMAKE_DEBUG_POSTFIX}) target_include_directories(${exe_name} PRIVATE . ${STB_INCLUDE_DIRS} ${Vulkan_INCLUDE_DIRS}) target_link_directories(${exe_name} PRIVATE ${Vulkan_LIBRARY}) -#target_link_libraries(${exe_name} PRIVATE Boost::boost Boost::exception Boost::program_options glfw glm::glm imgui::imgui tinyobjloader::tinyobjloader ${Vulkan_LIBRARIES} ${extra_libs}) -target_link_libraries(${exe_name} PRIVATE Boost::boost Boost::exception Boost::program_options glfw glm::glm imgui::imgui tinyobjloader ${Vulkan_LIBRARIES} ${extra_libs}) +target_link_libraries(${exe_name} PRIVATE Boost::boost Boost::exception Boost::program_options glfw glm::glm imgui::imgui tinyobjloader::tinyobjloader ${Vulkan_LIBRARIES} ${extra_libs})