GeorgH93/OpenVulkano
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Use system packages of libs when posible

Browse Source
This commit is contained in:
GeorgH93
2021-05-24 14:43:11 +02:00
parent e636b8eae5
commit 41aa57f0a9
2 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
3rdParty/CMakeLists.txt vendored
View File

@@ -2,15 +2,18 @@ add_subdirectory(glm)
if (NOT ANDROID AND NOT IOS) if (NOT ANDROID AND NOT IOS)
add_subdirectory(glfw) add_subdirectory(glfw)
endif() endif()
add_subdirectory(spdlog) if (NOT LINUX)
#add_subdirectory(assimp) add_subdirectory(spdlog)
add_subdirectory(assimp)
add_subdirectory(yaml-cpp)
endif()
add_subdirectory(magic-enum) add_subdirectory(magic-enum)
add_subdirectory(yaml-cpp)
add_subdirectory(pugixml) add_subdirectory(pugixml)
add_subdirectory(stb) add_subdirectory(stb)
add_subdirectory(eigen) add_subdirectory(eigen)
add_subdirectory(utfcpp) add_subdirectory(utfcpp)
if (NOT LINUX)
file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps) file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/deps)
execute_process( execute_process(
COMMAND ${CMAKE_COMMAND} -G ${CMAKE_GENERATOR} -DTOOLCHAIN_FILE=${TOOLCHAIN_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/libarchive 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) list(APPEND CMAKE_PREFIX_PATH ${CMAKE_BINARY_DIR}/deps/INSTALL)
endif()

11
CMakeLists.txt
View File

@@ -112,12 +112,14 @@ endif()
if (NOT ANDROID AND NOT IOS) if (NOT ANDROID AND NOT IOS)
Find_Package(OpenCV) Find_Package(OpenCV)
Find_Package(libjpeg-turbo) Find_Package(libjpeg-turbo)
Find_Package(Open3D)
target_include_directories(openVulkanoCpp PRIVATE ${OpenCV_INCLUDE_DIRS}) target_include_directories(openVulkanoCpp PRIVATE ${OpenCV_INCLUDE_DIRS})
target_link_libraries(openVulkanoCpp PRIVATE glfw ${OpenCV_LIBS} pugixml) target_link_libraries(openVulkanoCpp PRIVATE glfw ${OpenCV_LIBS} pugixml)
if (libjpeg-turbo_FOUND) if (libjpeg-turbo_FOUND)
target_link_libraries(openVulkanoCpp PRIVATE libjpeg-turbo::turbojpeg) target_link_libraries(openVulkanoCpp PRIVATE libjpeg-turbo::turbojpeg)
endif() 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) add_compile_definitions(GLM_FORCE_AVX2)
endif() endif()
@@ -127,6 +129,13 @@ if (IOS)
target_include_directories(openVulkanoCpp PRIVATE "/opt/libjpeg-turbo-ios/include") target_include_directories(openVulkanoCpp PRIVATE "/opt/libjpeg-turbo-ios/include")
endif () endif ()
if (LINUX)
find_package(spdlog)
find_package(fmt)
find_package(yaml-cpp)
target_link_libraries(openVulkanoCpp PRIVATE fmt)
endif()
find_package(LibArchive REQUIRED) find_package(LibArchive REQUIRED)
set(ZLIB_USE_STATIC_LIBS ON) set(ZLIB_USE_STATIC_LIBS ON)
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)