Skip to content

Commit 3199cc3

Browse files
committed
Simply vcpkg integration
Remove the makeshift dependency location lines in CMakeLists.txt and let vcpkg's vcpkg.cmake file handle the installation. I was making everything much more complicated than it had to be lol.
1 parent 2e49933 commit 3199cc3

2 files changed

Lines changed: 0 additions & 21 deletions

File tree

CMakeLists.txt

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,6 @@ add_library(
6262
${c_file_list}
6363
)
6464

65-
# Manually tell vcpkg where assimp and all related packages are because CMAKE_PREFIX_PATH is not working
66-
set(vcpkg_triplet_dir "${CMAKE_CURRENT_SOURCE_DIR}/vcpkg_installed/${VCPKG_TARGET_TRIPLET}")
67-
set(vcpkg_packages assimp kubazip unofficial-minizip pugixml poly2tri polyclipping RapidJSON utf8cpp)
68-
foreach(package_name ${vcpkg_packages})
69-
string(TOLOWER "${package_name}" package_path)
70-
set(${package_name}_DIR "${vcpkg_triplet_dir}/share/${package_path}")
71-
endforeach()
72-
set(CMAKE_MODULE_PATH ${vcpkg_triplet_dir}/share/stb)
73-
set(Stb_INCLUDE_DIR ${vcpkg_triplet_dir}/include)
74-
# Link vcpkg assimp
7565
find_package(assimp CONFIG REQUIRED)
7666
target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE assimp::assimp)
7767

src/main.cpp

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,6 @@
1313
#include "Window/createModuleWindows.hpp"
1414
#include "assets.hpp"
1515

16-
#include "assimp/shared/assimp/Importer.hpp"
17-
#include "assimp/shared/assimp/Exporter.hpp"
18-
#include "assimp/shared/assimp/scene.h"
19-
#include "assimp/shared/assimp/postprocess.h"
20-
#include "assimp/shared/assimp/mesh.h"
21-
#include "UnityEngine/Mesh.hpp"
22-
#include "UnityEngine/MeshRenderer.hpp"
23-
#include "UnityEngine/MeshFilter.hpp"
24-
#include "UnityEngine/MeshTopology.hpp"
25-
#include "UnityEngine/Rendering/IndexFormat.hpp"
26-
2716
#include "bsml/shared/Helpers/getters.hpp"
2817
#include "bsml/shared/BSML/MainThreadScheduler.hpp"
2918

0 commit comments

Comments
 (0)