mirror of
https://github.com/OpenMW/openmw.git
synced 2026-05-06 07:56:40 -04:00
Use non deprecated dependency name for sqlite lib (#8639)
Works for both versions of lib - system found and fetched from git.
This commit is contained in:
@@ -577,7 +577,12 @@ endif()
|
|||||||
|
|
||||||
include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
|
include_directories(${BULLET_INCLUDE_DIRS} ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
|
||||||
find_package(SQLite3 REQUIRED)
|
if (OPENMW_USE_SYSTEM_SQLITE3)
|
||||||
|
find_package(SQLite3 REQUIRED)
|
||||||
|
if(NOT TARGET SQLite3::SQLite3) # CMake < 4.3
|
||||||
|
add_library(SQLite3::SQLite3 ALIAS SQLite::SQLite3)
|
||||||
|
endif()
|
||||||
|
endif()
|
||||||
|
|
||||||
add_library(components STATIC ${COMPONENT_FILES})
|
add_library(components STATIC ${COMPONENT_FILES})
|
||||||
|
|
||||||
@@ -621,7 +626,7 @@ target_link_libraries(components
|
|||||||
RecastNavigation::Recast
|
RecastNavigation::Recast
|
||||||
|
|
||||||
Base64
|
Base64
|
||||||
SQLite::SQLite3
|
SQLite3::SQLite3
|
||||||
smhasher
|
smhasher
|
||||||
${ICU_LIBRARIES}
|
${ICU_LIBRARIES}
|
||||||
ZLIB::ZLIB
|
ZLIB::ZLIB
|
||||||
|
|||||||
Vendored
+1
-3
@@ -182,10 +182,8 @@ if (NOT OPENMW_USE_SYSTEM_SQLITE3)
|
|||||||
if (UNIX)
|
if (UNIX)
|
||||||
target_link_libraries(sqlite3 ${CMAKE_DL_LIBS})
|
target_link_libraries(sqlite3 ${CMAKE_DL_LIBS})
|
||||||
endif()
|
endif()
|
||||||
add_library(SQLite::SQLite3 ALIAS sqlite3)
|
|
||||||
|
|
||||||
set(SQLite3_INCLUDE_DIR ${sqlite3_SOURCE_DIR}/ PARENT_SCOPE)
|
add_library(SQLite3::SQLite3 ALIAS sqlite3)
|
||||||
set(SQLite3_LIBRARY sqlite3 PARENT_SCOPE)
|
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
add_subdirectory(smhasher)
|
add_subdirectory(smhasher)
|
||||||
|
|||||||
Reference in New Issue
Block a user