Commit 376ef8c7 authored by jan.koester's avatar jan.koester
Browse files

Merge branch 'main' of https://tuxist.de/git/jan.koester/libdbpp

parents da787842 e40dc97e

CMakeLists.txt

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ endif() 


include_directories(

  ${CMAKE_BINARY_DIR}

  ${CMAKE_SOURCE_DIR}/include

  ${CMAKE_CURRENT_SOURCE_DIR}/include

)



add_subdirectory(backends)

backends/CMakeLists.txt

+5 −3
Original line number Diff line number Diff line
@@ -9,8 +9,9 @@ endif() 
if(${PostgreSQL_FOUND})

    add_library(pgsql SHARED pgsql/pgsql.cpp)



    include_directories(

        ${PostgreSQL_INCLUDE_DIRS}

    target_include_directories(pgsql PRIVATE

       "${CMAKE_CURRENT_SOURCE_DIR}/../include"

       "${PostgreSQL_INCLUDE_DIRS}"

    )



    add_definitions(-DPGSQL)
@@ -33,7 +34,8 @@ if(${SQLite3_FOUND}) 
    add_library(sqlite SHARED sqlite/sqlite.cpp)



    target_include_directories(sqlite PRIVATE

        ${SQLite3_INCLUDE_DIRS}

        "${CMAKE_CURRENT_SOURCE_DIR}/../include"

        "${SQLite3_INCLUDE_DIRS}"

    )



    add_definitions(-DSQLITE)

backends/pgsql/pgsql.h

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 


#include <mutex>



#include <database.h>

#include "database.h"



#pragma once

backends/sqlite/sqlite.cpp

+0 −1
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include <atomic>



#include <sqlite3.h>

#include <database.h>



#include "sqlite.h"

backends/sqlite/sqlite.h

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 *******************************************************************************/



#include <database.h>

#include "database.h"



#pragma once