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

test

parent 425d00bc

CMakeLists.txt

+15 −0
Original line number Diff line number Diff line
@@ -71,3 +71,18 @@ install( 
)



add_subdirectory(examples)



if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")

    set(CPACK_GENERATOR WIX)

    set(CPACK_WIX_UPGRADE_GUID "18bd7bef-e88a-469f-8459-455e1fce424b")

    set(CPACK_PACKAGE_NAME "libdbpp")

    set(CPACK_PACKAGE_VENDOR "tuxist.de")

    set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_SOURCE_DIR}/LICENSE.txt")

    set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "libdbpp - A C++ Database Abstract Library")

    set(CPACK_PACKAGE_VERSION "1.0.0")

    set(CPACK_PACKAGE_VERSION_MAJOR "1")

    set(CPACK_PACKAGE_VERSION_MINOR "0")

    set(CPACK_PACKAGE_VERSION_PATCH "0")

    set(CPACK_PACKAGE_INSTALL_DIRECTORY "libdbpp")

    INCLUDE(CPack)

endif()
 
 No newline at end of file

CMakeSettings.json

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,16 @@ 
                    "name": "SQLite3_INCLUDE_DIR",

                    "value": "C:/Users/jan.koester/sqlite-src-3500400",

                    "type": "PATH"

                },

                {

                    "name": "PostgreSQL_INCLUDE_DIR",

                    "value": "C:/Users/jan.koester/pgsql/include",

                    "type": "PATH"

                },

                {

                    "name": "PostgreSQL_LIBRARY_RELEASE",

                    "value": "C:/Users/jan.koester/pgsql/lib/libpq.lib",

                    "type": "FILEPATH"

                }

            ]

        }

backends/CMakeLists.txt

+13 −4
Original line number Diff line number Diff line 
find_package(PostgreSQL)



if(${CMAKE_HOST_SYSTEM_NAME} MATCHES "Windows")

    set(DESTDIR bin)

else()

    set(DESTDIR lib/dbpp)

endif()



if(${PostgreSQL_FOUND})

    add_library(pgsql SHARED pgsql/pgsql.cpp)
@@ -8,11 +15,11 @@ if(${PostgreSQL_FOUND}) 


    add_definitions(-DPGSQL)



    target_link_libraries(pgsql PUBLIC dbpp ${PostgreSQL_LIBRARIES})

    target_link_libraries(pgsql PUBLIC dbpp PRIVATE ${PostgreSQL_LIBRARIES})



    set_target_properties(pgsql PROPERTIES PREFIX "")



    install(TARGETS pgsql DESTINATION lib/dbpp)

    install(TARGETS pgsql DESTINATION ${DESTDIR})

endif()



find_package(SQLite3)
@@ -25,10 +32,12 @@ if(${SQLite3_FOUND}) 


    add_definitions(-DSQLITE)



    target_link_libraries(sqlite PUBLIC dbpp ${SQLite3_LIBRARIES})

    message(STATUS "SQLite3_LIBRARIES: ${SQLite3_LIBRARIES}")



    target_link_libraries(sqlite PUBLIC dbpp PRIVATE ${SQLite3_LIBRARIES})



    set_target_properties(sqlite PROPERTIES PREFIX "")



    install(TARGETS sqlite DESTINATION lib/dbpp)

    install(TARGETS sqlite DESTINATION ${DESTDIR})

endif()

src/loader.cpp

+4 −2
Original line number Diff line number Diff line
@@ -39,9 +39,9 @@ 
#include <config.h>



dbpp::Database::Database(const char *dbdriver,const char* connstr){

    char path[512];

    snprintf(path,512,"%s/%s.so",PLGPATH,dbdriver);

#ifdef Windows

    char path[512];

    snprintf(path, 512, "%s.dll",dbdriver);



    std::cerr << path << std::endl;
@@ -82,6 +82,8 @@ dbpp::Database::Database(const char *dbdriver,const char* connstr){ 
    // Now, call the loaded 'create' function

    _DBApi = create_dbdriver(connstr);

#else

    char path[512];

    snprintf(path, 512, "%s/%s.so", PLGPATH, dbdriver);



    std::cerr << path << std::endl;