Commit da787842 authored by jan.koester's avatar jan.koester
Browse files

test

parent c658fd16

backends/CMakeLists.txt

+14 −2
Original line number Diff line number Diff line
@@ -19,7 +19,13 @@ if(${PostgreSQL_FOUND}) 


    set_target_properties(pgsql PROPERTIES PREFIX "")



    install(TARGETS pgsql DESTINATION ${DESTDIR})

    install(TARGETS pgsql DESTINATION ${DESTDIR} RUNTIME_DEPENDENCY_SET pgsqldep)

    install(

        RUNTIME_DEPENDENCY_SET pgsqldep 

        DESTINATION ${DESTDIR} 

        PRE_EXCLUDE_REGEXES   "((api|ext)-ms-.*|.*azureattest.*|vcruntime.*|ucrtbase.*|msvcrt.*|wpaxholder.*)\\.dll"

        POST_INSTALL_SCRIPT   "libpq.dll"

    )

endif()



find_package(SQLite3)
@@ -38,6 +44,12 @@ if(${SQLite3_FOUND}) 


    set_target_properties(sqlite PROPERTIES PREFIX "")



    install(TARGETS sqlite DESTINATION ${DESTDIR})

    install(TARGETS sqlite DESTINATION ${DESTDIR} RUNTIME_DEPENDENCY_SET sqlitedep)

        install(

        RUNTIME_DEPENDENCY_SET sqlitedep 

        DESTINATION ${DESTDIR} 

        PRE_EXCLUDE_REGEXES   "((api|ext)-ms-.*|.*azureattest.*|vcruntime.*|ucrtbase.*|msvcrt.*|wpaxholder.*)\\.dll"

        POST_INSTALL_SCRIPT   "sqlite3.dll" "libpq.dll"

    )

endif()

backends/pgsql/pgsql.cpp

+2 −2
Original line number Diff line number Diff line
@@ -104,10 +104,10 @@ void dbpp::Postgresql::reset(){ 
}





extern "C" dbpp::Postgresql* create(const char *coninfo) {

EXPORT dbpp::Postgresql* create(const char *coninfo) {

    return new dbpp::Postgresql(coninfo);

}



extern "C" void destroy(dbpp::Postgresql* p) {

EXPORT void destroy(dbpp::Postgresql* p) {

    delete p;

}

backends/sqlite/sqlite.h

+2 −2
Original line number Diff line number Diff line
@@ -55,11 +55,11 @@ namespace dbpp { 
    };

}



extern "C" dbpp::SQLite* create(const char *coninfo) {

EXPORT dbpp::SQLite* create(const char *coninfo) {

    return new dbpp::SQLite(coninfo);

}



extern "C" void destroy(dbpp::SQLite* p) {

EXPORT void destroy(dbpp::SQLite* p) {

    delete p;

}

include/database.h

+6 −0
Original line number Diff line number Diff line
@@ -36,6 +36,12 @@ 


#pragma once



#ifdef Windows

#define EXPORT extern "C" __declspec(dllexport)

#else

#define EXPORT extern "C"

#endif



namespace dbpp {

    class Database;

    class DatabaseApi;

libdbppConfig.cmake

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ include(CMakeFindDependencyMacro) 
# find_dependency(xx 2.0)

include(${CMAKE_CURRENT_LIST_DIR}/libdbppTargets.cmake)



set(DBPP_INCLUDE_DIR   "@CMAKE_INSTALL_INCLUDEDIR@" )

set(DBPP_INCLUDE_DIR   "${CMAKE_CURRENT_LIST_DIR}/../../../include" )