Revert tinyobjloader cmake changes. Likely a cmake regression accordi…

…ng to microsoft/vcpkg#37968
GPSnoopy · Apr 11, 2024 · 473aedc · 473aedc
1 parent 6936030
commit 473aedc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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})