diff --git a/CMakeLists.txt b/CMakeLists.txt index 5d619a0651..ba44f4e43a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -374,16 +374,15 @@ if(ANDROID) set(LIBZIP_INCLUDE_DIRS ${libzip_SOURCE_DIR}/lib ${libzip_BINARY_DIR} CACHE INTERNAL "libzip include paths") # Add libzip include directories globally for all targets include_directories(${LIBZIP_INCLUDE_DIRS}) - # Fetch spdlog for Android - include(FetchContent) + + # Fetch spdlog for Android - must be done before torch and libultraship + # Use the same version as libultraship to avoid conflicts FetchContent_Declare( spdlog GIT_REPOSITORY https://github.com/gabime/spdlog.git - GIT_TAG v1.13.0 + GIT_TAG v1.14.1 ) FetchContent_MakeAvailable(spdlog) - set(SPDLOG_INCLUDE_DIRS ${spdlog_SOURCE_DIR}/include ${spdlog_BINARY_DIR} CACHE INTERNAL "spdlog include paths") - include_directories(${SPDLOG_INCLUDE_DIRS}) # Add torch include directories for Android builds include_directories(${CMAKE_CURRENT_SOURCE_DIR}/torch) @@ -430,7 +429,6 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/extern/tinyxml2 ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/libultraship/Lib/ ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/libultraship/Lib/libjpeg/include/ - ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/libultraship/Lib/spdlog/include/ ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic/Fast3D/U64/PR ${CMAKE_CURRENT_SOURCE_DIR}/libultraship/src/graphic ${SDL2_INCLUDE_DIRS} diff --git a/libultraship/cmake/dependencies/android.cmake b/libultraship/cmake/dependencies/android.cmake index d409ca849c..f2b654ead3 100644 --- a/libultraship/cmake/dependencies/android.cmake +++ b/libultraship/cmake/dependencies/android.cmake @@ -70,15 +70,18 @@ if (NOT ${tinyxml2_FOUND}) endif() #=================== spdlog =================== -find_package(spdlog QUIET) -if (NOT ${spdlog_FOUND}) - FetchContent_Declare( - spdlog - GIT_REPOSITORY https://github.com/gabime/spdlog.git - GIT_TAG v1.14.1 - OVERRIDE_FIND_PACKAGE - ) - FetchContent_MakeAvailable(spdlog) +# Check if spdlog is already available (declared by parent project) +if(NOT TARGET spdlog::spdlog AND NOT TARGET spdlog) + find_package(spdlog QUIET) + if (NOT ${spdlog_FOUND}) + FetchContent_Declare( + spdlog + GIT_REPOSITORY https://github.com/gabime/spdlog.git + GIT_TAG v1.14.1 + OVERRIDE_FIND_PACKAGE + ) + FetchContent_MakeAvailable(spdlog) + endif() endif() target_link_libraries(ImGui PUBLIC SDL2::SDL2)