Skip to content

Commit

Permalink
Merge pull request #191 from gdt050579/tmp_sqlite
Browse files Browse the repository at this point in the history
Tmp sqlite
  • Loading branch information
gheorghitamutu authored Jan 3, 2024
2 parents 08cf9fe + 3e36080 commit 612576d
Show file tree
Hide file tree
Showing 24 changed files with 1,180 additions and 388 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ AlwaysBreakTemplateDeclarations : true
BinPackArguments : false
BinPackParameters : false
BreakBeforeBinaryOperators : None
BreakBeforeBraces : Allman
BreakBeforeBraces : Linux
BreakBeforeTernaryOperators : true
BreakConstructorInitializersBeforeComma : false
BreakStringLiterals : true
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@ CMakeFiles/
cmake-build-*/
vcpkg_installed/
.DS_Store
*.db
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,8 @@ add_subdirectory(Types/VBA)
add_subdirectory(Types/JS)
add_subdirectory(Types/PYEXTRACTOR)
add_subdirectory(Types/ZIP)
add_subdirectory(Types/SQLite)


# Generic plugins supported by GView
add_subdirectory(GenericPlugins/CharacterTable)
Expand Down
4 changes: 4 additions & 0 deletions GViewCore/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ message(STATUS "MINIZIP_INCLUDE_DIR => ${MINIZIP_INCLUDE_DIR}")
target_include_directories(${PROJECT_NAME} PRIVATE ${MINIZIP_INCLUDE_DIR})
target_link_libraries(${PROJECT_NAME} PRIVATE MINIZIP::minizip-ng)

message(STATUS "SQLITE3_INCLUDE_DIR => ${SQLITE3_INCLUDE_DIR}")
find_package(unofficial-sqlite3 CONFIG REQUIRED)
target_link_libraries(${PROJECT_NAME} PRIVATE unofficial::sqlite3::sqlite3)

if (MSVC)
add_compile_options(-W3)
elseif (APPLE)
Expand Down
Loading

0 comments on commit 612576d

Please sign in to comment.