edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix include directories for SQLite by heinrich5991

Browse source
This commit is contained in:
Zwelf 2020-08-03 16:07:36 +02:00
parent 9e1979f561
commit 0fa13f6bf9
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -2510,7 +2510,7 @@ foreach(target ${TARGETS_OWN})
target_include_directories(${target} PRIVATE ${PROJECT_BINARY_DIR}/src) target_include_directories(${target} PRIVATE ${PROJECT_BINARY_DIR}/src)
target_include_directories(${target} PRIVATE src) target_include_directories(${target} PRIVATE src)
target_compile_definitions(${target} PRIVATE $<$<CONFIG:Debug>:CONF_DEBUG>) target_compile_definitions(${target} PRIVATE $<$<CONFIG:Debug>:CONF_DEBUG>)
target_include_directories(${target} PRIVATE ${ZLIB_INCLUDE_DIRS}) target_include_directories(${target} PRIVATE ${SQLite3_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS})
target_compile_definitions(${target} PRIVATE GLEW_STATIC) target_compile_definitions(${target} PRIVATE GLEW_STATIC)
if(CRYPTO_FOUND) if(CRYPTO_FOUND)
target_compile_definitions(${target} PRIVATE CONF_OPENSSL) target_compile_definitions(${target} PRIVATE CONF_OPENSSL)

9
cmake/FindSQLite3.cmake
View file

@ -26,15 +26,12 @@ if(NOT SQLite3_FOUND)
) )
include(FindPackageHandleStandardArgs) include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLite3_INCLUDEDIR) find_package_handle_standard_args(SQLite3 DEFAULT_MSG SQLite3_INCLUDEDIR SQLite3_LIBRARY)
mark_as_advanced(SQLite3_INCLUDEDIR SQLite3_LIBRARY) mark_as_advanced(SQLite3_INCLUDEDIR SQLite3_LIBRARY)
endif() endif()
if(SQLite3_FOUND) if(SQLite3_FOUND)
if(SQLite3_LIBRARY) is_bundled(SQLite3_BUNDLED "${SQLite3_LIBRARY}")
set(SQLite3_LIBRARIES ${SQLite3_LIBRARY}) set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
else() set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDEDIR})
set(SQLite3_LIBRARIES)
endif()
endif() endif()