From 7ba10372308a438bcc0dec7fa7ff88045cef927e Mon Sep 17 00:00:00 2001 From: JackCarterSmith Date: Wed, 18 Jan 2023 19:46:42 +0100 Subject: [PATCH] Okay fuck it stupid dirty dependency I'll take cate of you later --- RSEModel/CMakeLists.txt | 14 ++++++++------ conanfile.txt | 4 ++-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/RSEModel/CMakeLists.txt b/RSEModel/CMakeLists.txt index 470b039..0195dd2 100644 --- a/RSEModel/CMakeLists.txt +++ b/RSEModel/CMakeLists.txt @@ -14,10 +14,10 @@ if(BUILD_TOOLS) # Import needed packages and references their include path find_package(GLEW REQUIRED) include_directories(${GLEW_INCLUDE_DIR}) - find_package(Vulkan REQUIRED) - include_directories(${Vulkan_INCLUDE_DIR}) - find_package(vulkan-memory-allocator REQUIRED) - include_directories(${vulkan-memory-allocator_INCLUDE_DIR}) + #find_package(Vulkan REQUIRED) + #include_directories(${Vulkan_INCLUDE_DIR}) + #find_package(vulkan-memory-allocator REQUIRED) + #include_directories(${vulkan-memory-allocator_INCLUDE_DIR}) # Define src/headers files @@ -47,8 +47,10 @@ if(BUILD_TOOLS) # Link externals libraries to the linker if(RSPMODEL_SHARED) - target_link_libraries(rse-model PRIVATE rsp-model-lib ${GLEW_LIBRARIES} ${Vulkan_LIBRARIES} ${AUX_LIBS}) + #target_link_libraries(rse-model PRIVATE rsp-model-lib ${GLEW_LIBRARIES} ${Vulkan_LIBRARIES} ${AUX_LIBS}) + target_link_libraries(rse-model PRIVATE rsp-model-lib ${GLEW_LIBRARIES} ${AUX_LIBS}) elseif(RSPMODEL_STATIC) - target_link_libraries(rse-model PRIVATE rsp-model-libstatic ${GLEW_LIBRARIES} ${Vulkan_LIBRARIES} ${AUX_LIBS}) + #target_link_libraries(rse-model PRIVATE rsp-model-libstatic ${GLEW_LIBRARIES} ${Vulkan_LIBRARIES} ${AUX_LIBS}) + target_link_libraries(rse-model PRIVATE rsp-model-libstatic ${GLEW_LIBRARIES} ${AUX_LIBS}) endif() endif() diff --git a/conanfile.txt b/conanfile.txt index 41be7a5..8c1650e 100644 --- a/conanfile.txt +++ b/conanfile.txt @@ -3,8 +3,8 @@ #glu/system glew/2.2.0 #vulkan-headers/1.3.236.0 -vulkan-memory-allocator/3.0.1 -vulkan-loader/1.3.236.0 +#vulkan-memory-allocator/3.0.1 +#vulkan-loader/1.3.236.0 [generators] cmake