diff --git a/3rdParty/CMakeLists.txt b/3rdParty/CMakeLists.txt index 057f04b..1bf57fd 100644 --- a/3rdParty/CMakeLists.txt +++ b/3rdParty/CMakeLists.txt @@ -2,15 +2,18 @@ add_subdirectory(glm) if (NOT ANDROID AND NOT IOS) add_subdirectory(glfw) endif() -add_subdirectory(spdlog) -#add_subdirectory(assimp) +if (NOT LINUX) + add_subdirectory(spdlog) + add_subdirectory(assimp) + add_subdirectory(yaml-cpp) +endif() add_subdirectory(magic-enum) -add_subdirectory(yaml-cpp) add_subdirectory(pugixml) add_subdirectory(stb) add_subdirectory(eigen) add_subdirectory(utfcpp) +if (NOT LINUX) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps) execute_process( COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/libarchive @@ -21,3 +24,4 @@ execute_process( ) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL) +endif() diff --git a/CMakeLists.txt b/CMakeLists.txt index ea83b80..0a1220a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -112,12 +112,14 @@ endif() if (NOT ANDROID AND NOT IOS) Find_Package(OpenCV) Find_Package(libjpeg-turbo) + Find_Package(Open3D) target_include_directories(openVulkanoCpp PRIVATE ${OpenCV_INCLUDE_DIRS}) target_link_libraries(openVulkanoCpp PRIVATE glfw ${OpenCV_LIBS} pugixml) if (libjpeg-turbo_FOUND) target_link_libraries(openVulkanoCpp PRIVATE libjpeg-turbo::turbojpeg) endif() - #target_link_libraries(openVulkanoCpp PRIVATE assimp) + target_link_libraries(openVulkanoCpp PRIVATE Open3D::Open3D) + target_link_libraries(openVulkanoCpp PRIVATE assimp) add_compile_definitions(GLM_FORCE_AVX2) endif() @@ -127,6 +129,13 @@ if (IOS) target_include_directories(openVulkanoCpp PRIVATE "/opt/libjpeg-turbo-ios/include") endif () +if (LINUX) + find_package(spdlog) + find_package(fmt) + find_package(yaml-cpp) + target_link_libraries(openVulkanoCpp PRIVATE fmt) +endif() + find_package(LibArchive REQUIRED) set(ZLIB_USE_STATIC_LIBS ON) find_package(ZLIB REQUIRED)