diff --git a/ThirdParty/soci/.gitignore b/ThirdParty/soci/.gitignore index d031937..84c048a 100644 --- a/ThirdParty/soci/.gitignore +++ b/ThirdParty/soci/.gitignore @@ -1,40 +1 @@ -# General -*.swp -*.kate-swp -tags -tmp - -# Files generated by CMake -Makefile -src/core/soci_backends_config.h -tests/odbc/test-access.dsn -tests/odbc/test-mysql.dsn - -# ... and the rest of CMake spam -CMakeFiles/ -CMakeCache.txt -CTestTestfile.cmake -cmake_install.cmake - -# Visual Studio / Visual Studio Code -*.opensdf -*.sdf -*.suo -/*.vs* - -# KDevelop -*.kate-swp -*.kdev4 - -# Qt Creator -*.config -*.creator* -*.files -*.includes -CMakeLists.txt.user - -# Eclipse -/.project - -# Vagrant -/.vagrant/ +/build/ diff --git a/ThirdParty/soci/Build.ps1 b/ThirdParty/soci/Build.ps1 index 5067634..0d1e281 100644 --- a/ThirdParty/soci/Build.ps1 +++ b/ThirdParty/soci/Build.ps1 @@ -1,13 +1,23 @@ $ErrorActionPreference = 'Stop' +function SetReleaseModeToStaticLinkRuntimeLibrary([string][parameter(mandatory)]$Path) { + $projectPath = (Resolve-Path -LiteralPath $Path).ProviderPath + Write-Host "$path -> $projectPath" + [xml]$project = cat -LiteralPath $projectPath + ($project.Project.ItemDefinitionGroup | ? Condition -eq "'`$(Configuration)|`$(Platform)'=='Release|x64'" ).ClCompile.RuntimeLibrary = 'MultiThreaded' + $project.Save($projectPath) +} + pushd $PSScriptRoot try { if(test-path build) { rm -r -fo build } md build | cd - cmake -G "Visual Studio 15 Win64" -DWITH_BOOST=OFF -DWITH_ORACLE=OFF -DWITH_ODBC=ON -DWITH_MYSQL=OFF -DWITH_POSTGRESQL=OFF -DWITH_FIREBIRD=OFF -DWITH_DB2=OFF -DSOCI_CXX_C11=ON -DSOCI_STATIC=ON -DSOCI_SHARED=OFF -DSOCI_TESTS=OFF .. + cmake -G "Visual Studio 15 Win64" -DWITH_BOOST=OFF -DWITH_ORACLE=OFF -DWITH_ODBC=ON -DWITH_MYSQL=OFF -DWITH_POSTGRESQL=OFF -DWITH_FIREBIRD=OFF -DWITH_DB2=OFF -DSOCI_CXX_C11=ON -DSOCI_STATIC=ON -DSOCI_SHARED=OFF -DSOCI_TESTS=OFF ../src + SetReleaseModeToStaticLinkRuntimeLibrary src/core/soci_core_static.vcxproj + SetReleaseModeToStaticLinkRuntimeLibrary src/backends/odbc/soci_odbc_static.vcxproj cmake --build . --config Debug cmake --build . --config Release } finally { popd -} \ No newline at end of file +} diff --git a/ThirdParty/soci/CMakeLists.txt b/ThirdParty/soci/CMakeLists.txt deleted file mode 100644 index 7798b45..0000000 --- a/ThirdParty/soci/CMakeLists.txt +++ /dev/null @@ -1,207 +0,0 @@ -############################################################################### -# -# This file is part of CMake configuration for SOCI library -# -# Copyright (C) 2009-2013 Mateusz Loskot -# Distributed under the Boost Software License, Version 1.0. -# (See accompanying file LICENSE_1_0.txt or copy at -# http://www.boost.org/LICENSE_1_0.txt) -# -############################################################################### -# General settings -############################################################################### -cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR) - -project(SOCI) - -############################################################################### -# Build features and variants -############################################################################## - -option(SOCI_SHARED "Enable build of shared libraries" ON) -option(SOCI_STATIC "Enable build of static libraries" ON) -option(SOCI_TESTS "Enable build of collection of SOCI tests" ON) -option(SOCI_ASAN "Enable address sanitizer on GCC v4.8+/Clang v 3.1+" OFF) - - -############################################################################### -# SOCI CMake modules -############################################################################### - -# Path to additional CMake modules -set(CMAKE_MODULE_PATH ${SOCI_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) -set(CMAKE_MODULE_PATH ${SOCI_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) - -include(SociUtilities) -include(SociConfig) - -colormsg(_HIBLUE_ "Configuring SOCI:") - -############################################################################### -# SOCI version information -############################################################################### -include(SociVersion) - -soci_version() - -############################################################################### -# Build features and variants -############################################################################## - -boost_report_value(SOCI_SHARED) -boost_report_value(SOCI_STATIC) -boost_report_value(SOCI_TESTS) -boost_report_value(SOCI_ASAN) - -# from SociConfig.cmake -boost_report_value(SOCI_CXX_C11) -boost_report_value(LIB_SUFFIX) - -# Put the libaries and binaries that get built into directories at the -# top of the build tree rather than in hard-to-find leaf -# directories. This simplifies manual testing and the use of the build -# tree rather than installed Boost libraries. -set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) -set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) - -############################################################################### -# Find SOCI dependencies -############################################################################### - -set(SOCI_CORE_TARGET) -set(SOCI_CORE_TARGET_STATIC) -set(SOCI_CORE_DEPS_LIBS) - -include(SociDependencies) - -get_property(SOCI_INCLUDE_DIRS DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - PROPERTY INCLUDE_DIRECTORIES) - -if(Threads_FOUND) - list(APPEND SOCI_CORE_DEPS_LIBS ${CMAKE_THREAD_LIBS_INIT}) -else() - message(FATAL_ERROR "No thread library found") -endif() - -if(NOT MSVC) - set(DL_FIND_QUIETLY TRUE) - find_package(DL) - if(DL_FOUND) - list(APPEND SOCI_CORE_DEPS_LIBS ${DL_LIBRARY}) - set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES ${DL_INCLUDE_DIR}) - add_definitions(-DHAVE_DL=1) - endif() -endif() - -if(Boost_FOUND) - get_property(SOCI_COMPILE_DEFINITIONS - DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - PROPERTY COMPILE_DEFINITIONS) - - set(SOCI_HAVE_BOOST ON) - - list(APPEND SOCI_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") - - if(Boost_DATE_TIME_FOUND) - list(APPEND SOCI_CORE_DEPS_LIBS ${Boost_DATE_TIME_LIBRARY}) - set(SOCI_HAVE_BOOST_DATE_TIME ON) - endif() - - list(APPEND SOCI_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}) - list(APPEND SOCI_CORE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}) - - set_directory_properties(PROPERTY COMPILE_DEFINITIONS "${SOCI_COMPILE_DEFINITIONS}") - - set_property(DIRECTORY ${SOCI_SOURCE_DIR} - PROPERTY COMPILE_DEFINITIONS "${SOCI_COMPILE_DEFINITIONS}") -else() - set(SOCI_HAVE_BOOST OFF) - set(SOCI_HAVE_BOOST_DATE_TIME OFF) -endif() - -set(SOCI_HAVE_BOOST ${SOCI_HAVE_BOOST} CACHE INTERNAL "Boost library") -set(SOCI_HAVE_BOOST_DATE_TIME ${SOCI_HAVE_BOOST_DATE_TIME} CACHE INTERNAL "Boost date_time library") - -list(APPEND SOCI_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}) - -set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - PROPERTY - INCLUDE_DIRECTORIES ${SOCI_INCLUDE_DIRS}) - -############################################################################### -# Installation -############################################################################### - -if(NOT DEFINED SOCI_LIBDIR) - if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) - set(SOCI_LIBDIR "lib") - else() - set(SOCI_LIBDIR "lib64") - endif() -endif() - -set(BINDIR "bin" CACHE PATH "The directory to install binaries into.") -set(LIBDIR ${SOCI_LIBDIR} CACHE PATH "The directory to install libraries into.") -set(DATADIR "share" CACHE PATH "The directory to install data files into.") -set(INCLUDEDIR "include" CACHE PATH "The directory to install includes into.") - -############################################################################### -# Configuration files -############################################################################### -set(CONFIG_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) -install(DIRECTORY ${CONFIG_INCLUDE_DIR}/soci DESTINATION ${INCLUDEDIR}) -set(CONFIG_FILE_IN "include/soci/soci-config.h.in") -set(CONFIG_FILE_OUT "${CONFIG_INCLUDE_DIR}/soci/soci-config.h") - - - -############################################################################### -# Build configured components -############################################################################### -include(SociBackend) - -include_directories(${SOCI_SOURCE_DIR}/include ${CONFIG_INCLUDE_DIR}) -add_subdirectory(src) - -if(SOCI_TESTS) - ############################################################################### - # Enable tests - ############################################################################### - enable_testing() - - file(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR} TEST_ACCESS_PATH) - configure_file(${PROJECT_SOURCE_DIR}/cmake/configs/test-access.cmake ${PROJECT_SOURCE_DIR}/tests/odbc/test-access.dsn @ONLY) - - set(MYSQL_DRIVER_NAME "MySQL") - if(WIN32) - set(MYSQL_DRIVER_NAME "MySQL ODBC 5.3 ANSI Driver") - endif() - configure_file(${PROJECT_SOURCE_DIR}/cmake/configs/test-mysql.cmake ${PROJECT_SOURCE_DIR}/tests/odbc/test-mysql.dsn @ONLY) - - # Define "make check" as alias for "make test" - add_custom_target(check COMMAND ctest) - add_subdirectory(tests) -endif() - -############################################################################### -# build config file -############################################################################### - -get_cmake_property(ALL_VARIABLES CACHE_VARIABLES) -set(CONFIGURED_VARIABLES) -foreach(v ${ALL_VARIABLES}) - if (v MATCHES "^SOCI_HAVE.*") - get_property(CACHE_HELPSTRING CACHE ${v} PROPERTY HELPSTRING) - set(CONFIGURED_VARIABLES "${CONFIGURED_VARIABLES}\n// ${CACHE_HELPSTRING}\n") - if (${${v}}) - set(CONFIGURED_VARIABLES "${CONFIGURED_VARIABLES}#define ${v}\n") - else() - set(CONFIGURED_VARIABLES "${CONFIGURED_VARIABLES}/* #undef ${v} */\n") - endif() - endif() -endforeach() -configure_file("${CONFIG_FILE_IN}" "${CONFIG_FILE_OUT}") - -message(STATUS "") - diff --git a/ThirdParty/soci/build/include/soci/soci-config.h b/ThirdParty/soci/build/include/soci/soci-config.h deleted file mode 100644 index fcf8840..0000000 --- a/ThirdParty/soci/build/include/soci/soci-config.h +++ /dev/null @@ -1,49 +0,0 @@ -// -// Copyright (C) 2004-2008 Maciej Sobczak, Stephen Hutton -// Distributed under the Boost Software License, Version 1.0. -// (See accompanying file LICENSE_1_0.txt or copy at -// http://www.boost.org/LICENSE_1_0.txt) -// - -#ifndef SOCICONFIG_H_INCLUDED -#define SOCICONFIG_H_INCLUDED - -// -// SOCI has been build with support for: -// - -// Boost library -/* #undef SOCI_HAVE_BOOST */ - -// Boost date_time library -/* #undef SOCI_HAVE_BOOST_DATE_TIME */ - -// Enables C++11 support -#define SOCI_HAVE_CXX_C11 - -// DB2 backend -/* #undef SOCI_HAVE_DB2 */ - -// EMPTY backend -#define SOCI_HAVE_EMPTY - -// FIREBIRD backend -/* #undef SOCI_HAVE_FIREBIRD */ - -// MYSQL backend -/* #undef SOCI_HAVE_MYSQL */ - -// ODBC backend -#define SOCI_HAVE_ODBC - -// ORACLE backend -/* #undef SOCI_HAVE_ORACLE */ - -// POSTGRESQL backend -/* #undef SOCI_HAVE_POSTGRESQL */ - -// SQLITE3 backend -/* #undef SOCI_HAVE_SQLITE3 */ - - -#endif // SOCICONFIG_H_INCLUDED diff --git a/ThirdParty/soci/build/lib/Debug/libsoci_core_4_0.lib b/ThirdParty/soci/build/lib/Debug/libsoci_core_4_0.lib index 13aa054..454c8f8 100644 Binary files a/ThirdParty/soci/build/lib/Debug/libsoci_core_4_0.lib and b/ThirdParty/soci/build/lib/Debug/libsoci_core_4_0.lib differ diff --git a/ThirdParty/soci/build/lib/Debug/libsoci_empty_4_0.lib b/ThirdParty/soci/build/lib/Debug/libsoci_empty_4_0.lib index 4f5de07..7d7de1a 100644 Binary files a/ThirdParty/soci/build/lib/Debug/libsoci_empty_4_0.lib and b/ThirdParty/soci/build/lib/Debug/libsoci_empty_4_0.lib differ diff --git a/ThirdParty/soci/build/lib/Debug/libsoci_odbc_4_0.lib b/ThirdParty/soci/build/lib/Debug/libsoci_odbc_4_0.lib index 244e196..4a6f67b 100644 Binary files a/ThirdParty/soci/build/lib/Debug/libsoci_odbc_4_0.lib and b/ThirdParty/soci/build/lib/Debug/libsoci_odbc_4_0.lib differ diff --git a/ThirdParty/soci/build/lib/Release/libsoci_core_4_0.lib b/ThirdParty/soci/build/lib/Release/libsoci_core_4_0.lib index 2731bfa..0fe9fa9 100644 Binary files a/ThirdParty/soci/build/lib/Release/libsoci_core_4_0.lib and b/ThirdParty/soci/build/lib/Release/libsoci_core_4_0.lib differ diff --git a/ThirdParty/soci/build/lib/Release/libsoci_empty_4_0.lib b/ThirdParty/soci/build/lib/Release/libsoci_empty_4_0.lib index afa6ff5..639814c 100644 Binary files a/ThirdParty/soci/build/lib/Release/libsoci_empty_4_0.lib and b/ThirdParty/soci/build/lib/Release/libsoci_empty_4_0.lib differ diff --git a/ThirdParty/soci/build/lib/Release/libsoci_odbc_4_0.lib b/ThirdParty/soci/build/lib/Release/libsoci_odbc_4_0.lib index 8d41db1..8d6de28 100644 Binary files a/ThirdParty/soci/build/lib/Release/libsoci_odbc_4_0.lib and b/ThirdParty/soci/build/lib/Release/libsoci_odbc_4_0.lib differ diff --git a/ThirdParty/soci/.circleci/config.yml b/ThirdParty/soci/src/.circleci/config.yml similarity index 100% rename from ThirdParty/soci/.circleci/config.yml rename to ThirdParty/soci/src/.circleci/config.yml diff --git a/ThirdParty/soci/.editorconfig b/ThirdParty/soci/src/.editorconfig similarity index 100% rename from ThirdParty/soci/.editorconfig rename to ThirdParty/soci/src/.editorconfig diff --git a/ThirdParty/soci/.gitattributes b/ThirdParty/soci/src/.gitattributes similarity index 100% rename from ThirdParty/soci/.gitattributes rename to ThirdParty/soci/src/.gitattributes diff --git a/ThirdParty/soci/src/.gitignore b/ThirdParty/soci/src/.gitignore index 4746d47..0452661 100644 --- a/ThirdParty/soci/src/.gitignore +++ b/ThirdParty/soci/src/.gitignore @@ -1,20 +1,44 @@ -*~ -*.kdev[0-9] +# General *.swp -aclocal.m4 -autom4te.cache -confdefs.h -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -m4 -missing -Makefile -Makefile.in +*.kate-swp +tags tmp + +# Build directories +/*build* +/*site* + +# Files generated by CMake +Makefile +src/core/soci_backends_config.h +tests/odbc/test-access.dsn +tests/odbc/test-mysql.dsn + +# ... and the rest of CMake spam +CMakeFiles/ +CMakeCache.txt +CTestTestfile.cmake +cmake_install.cmake + +# Visual Studio / Visual Studio Code +*.opensdf +*.sdf +*.suo +/*.vs* + +# KDevelop +*.kate-swp +*.kdev4 + +# Qt Creator +*.config +*.creator* +*.files +*.includes +CMakeLists.txt.user + +# Eclipse +/.project + +# Vagrant +/.vagrant/ diff --git a/ThirdParty/soci/.markdownlint.json b/ThirdParty/soci/src/.markdownlint.json similarity index 100% rename from ThirdParty/soci/.markdownlint.json rename to ThirdParty/soci/src/.markdownlint.json diff --git a/ThirdParty/soci/.travis.yml b/ThirdParty/soci/src/.travis.yml similarity index 100% rename from ThirdParty/soci/.travis.yml rename to ThirdParty/soci/src/.travis.yml diff --git a/ThirdParty/soci/AUTHORS b/ThirdParty/soci/src/AUTHORS similarity index 100% rename from ThirdParty/soci/AUTHORS rename to ThirdParty/soci/src/AUTHORS diff --git a/ThirdParty/soci/CHANGELOG.md b/ThirdParty/soci/src/CHANGELOG.md similarity index 100% rename from ThirdParty/soci/CHANGELOG.md rename to ThirdParty/soci/src/CHANGELOG.md diff --git a/ThirdParty/soci/CHANGES b/ThirdParty/soci/src/CHANGES similarity index 100% rename from ThirdParty/soci/CHANGES rename to ThirdParty/soci/src/CHANGES diff --git a/ThirdParty/soci/src/CMakeLists.txt b/ThirdParty/soci/src/CMakeLists.txt index 472ae86..7798b45 100644 --- a/ThirdParty/soci/src/CMakeLists.txt +++ b/ThirdParty/soci/src/CMakeLists.txt @@ -2,13 +2,206 @@ # # This file is part of CMake configuration for SOCI library # -# Copyright (C) 2013 Mateusz Loskot +# Copyright (C) 2009-2013 Mateusz Loskot # Distributed under the Boost Software License, Version 1.0. # (See accompanying file LICENSE_1_0.txt or copy at # http://www.boost.org/LICENSE_1_0.txt) # ############################################################################### -include_directories(${SOCI_SOURCE_DIR}/include/private) +# General settings +############################################################################### +cmake_minimum_required(VERSION 2.8.10 FATAL_ERROR) + +project(SOCI) + +############################################################################### +# Build features and variants +############################################################################## + +option(SOCI_SHARED "Enable build of shared libraries" ON) +option(SOCI_STATIC "Enable build of static libraries" ON) +option(SOCI_TESTS "Enable build of collection of SOCI tests" ON) +option(SOCI_ASAN "Enable address sanitizer on GCC v4.8+/Clang v 3.1+" OFF) + + +############################################################################### +# SOCI CMake modules +############################################################################### + +# Path to additional CMake modules +set(CMAKE_MODULE_PATH ${SOCI_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH}) +set(CMAKE_MODULE_PATH ${SOCI_SOURCE_DIR}/cmake/modules ${CMAKE_MODULE_PATH}) + +include(SociUtilities) +include(SociConfig) + +colormsg(_HIBLUE_ "Configuring SOCI:") + +############################################################################### +# SOCI version information +############################################################################### +include(SociVersion) + +soci_version() + +############################################################################### +# Build features and variants +############################################################################## + +boost_report_value(SOCI_SHARED) +boost_report_value(SOCI_STATIC) +boost_report_value(SOCI_TESTS) +boost_report_value(SOCI_ASAN) + +# from SociConfig.cmake +boost_report_value(SOCI_CXX_C11) +boost_report_value(LIB_SUFFIX) + +# Put the libaries and binaries that get built into directories at the +# top of the build tree rather than in hard-to-find leaf +# directories. This simplifies manual testing and the use of the build +# tree rather than installed Boost libraries. +set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) +set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) + +############################################################################### +# Find SOCI dependencies +############################################################################### + +set(SOCI_CORE_TARGET) +set(SOCI_CORE_TARGET_STATIC) +set(SOCI_CORE_DEPS_LIBS) + +include(SociDependencies) + +get_property(SOCI_INCLUDE_DIRS DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + PROPERTY INCLUDE_DIRECTORIES) + +if(Threads_FOUND) + list(APPEND SOCI_CORE_DEPS_LIBS ${CMAKE_THREAD_LIBS_INIT}) +else() + message(FATAL_ERROR "No thread library found") +endif() + +if(NOT MSVC) + set(DL_FIND_QUIETLY TRUE) + find_package(DL) + if(DL_FOUND) + list(APPEND SOCI_CORE_DEPS_LIBS ${DL_LIBRARY}) + set_directory_properties(PROPERTIES INCLUDE_DIRECTORIES ${DL_INCLUDE_DIR}) + add_definitions(-DHAVE_DL=1) + endif() +endif() + +if(Boost_FOUND) + get_property(SOCI_COMPILE_DEFINITIONS + DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + PROPERTY COMPILE_DEFINITIONS) + + set(SOCI_HAVE_BOOST ON) + + list(APPEND SOCI_COMPILE_DEFINITIONS "BOOST_ALL_NO_LIB") + + if(Boost_DATE_TIME_FOUND) + list(APPEND SOCI_CORE_DEPS_LIBS ${Boost_DATE_TIME_LIBRARY}) + set(SOCI_HAVE_BOOST_DATE_TIME ON) + endif() + + list(APPEND SOCI_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}) + list(APPEND SOCI_CORE_INCLUDE_DIRS ${Boost_INCLUDE_DIRS}) + + set_directory_properties(PROPERTY COMPILE_DEFINITIONS "${SOCI_COMPILE_DEFINITIONS}") + + set_property(DIRECTORY ${SOCI_SOURCE_DIR} + PROPERTY COMPILE_DEFINITIONS "${SOCI_COMPILE_DEFINITIONS}") +else() + set(SOCI_HAVE_BOOST OFF) + set(SOCI_HAVE_BOOST_DATE_TIME OFF) +endif() + +set(SOCI_HAVE_BOOST ${SOCI_HAVE_BOOST} CACHE INTERNAL "Boost library") +set(SOCI_HAVE_BOOST_DATE_TIME ${SOCI_HAVE_BOOST_DATE_TIME} CACHE INTERNAL "Boost date_time library") + +list(APPEND SOCI_INCLUDE_DIRS ${CMAKE_CURRENT_BINARY_DIR}) + +set_property(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + PROPERTY + INCLUDE_DIRECTORIES ${SOCI_INCLUDE_DIRS}) + +############################################################################### +# Installation +############################################################################### + +if(NOT DEFINED SOCI_LIBDIR) + if(APPLE OR CMAKE_SIZEOF_VOID_P EQUAL 4) + set(SOCI_LIBDIR "lib") + else() + set(SOCI_LIBDIR "lib64") + endif() +endif() + +set(BINDIR "bin" CACHE PATH "The directory to install binaries into.") +set(LIBDIR ${SOCI_LIBDIR} CACHE PATH "The directory to install libraries into.") +set(DATADIR "share" CACHE PATH "The directory to install data files into.") +set(INCLUDEDIR "include" CACHE PATH "The directory to install includes into.") + +############################################################################### +# Configuration files +############################################################################### +set(CONFIG_INCLUDE_DIR ${CMAKE_CURRENT_BINARY_DIR}/include) +install(DIRECTORY ${CONFIG_INCLUDE_DIR}/soci DESTINATION ${INCLUDEDIR}) +set(CONFIG_FILE_IN "include/soci/soci-config.h.in") +set(CONFIG_FILE_OUT "${CONFIG_INCLUDE_DIR}/soci/soci-config.h") + + + +############################################################################### +# Build configured components +############################################################################### +include(SociBackend) + +include_directories(${SOCI_SOURCE_DIR}/include ${CONFIG_INCLUDE_DIR}) +add_subdirectory(src) + +if(SOCI_TESTS) + ############################################################################### + # Enable tests + ############################################################################### + enable_testing() + + file(TO_NATIVE_PATH ${PROJECT_SOURCE_DIR} TEST_ACCESS_PATH) + configure_file(${PROJECT_SOURCE_DIR}/cmake/configs/test-access.cmake ${PROJECT_SOURCE_DIR}/tests/odbc/test-access.dsn @ONLY) + + set(MYSQL_DRIVER_NAME "MySQL") + if(WIN32) + set(MYSQL_DRIVER_NAME "MySQL ODBC 5.3 ANSI Driver") + endif() + configure_file(${PROJECT_SOURCE_DIR}/cmake/configs/test-mysql.cmake ${PROJECT_SOURCE_DIR}/tests/odbc/test-mysql.dsn @ONLY) + + # Define "make check" as alias for "make test" + add_custom_target(check COMMAND ctest) + add_subdirectory(tests) +endif() + +############################################################################### +# build config file +############################################################################### + +get_cmake_property(ALL_VARIABLES CACHE_VARIABLES) +set(CONFIGURED_VARIABLES) +foreach(v ${ALL_VARIABLES}) + if (v MATCHES "^SOCI_HAVE.*") + get_property(CACHE_HELPSTRING CACHE ${v} PROPERTY HELPSTRING) + set(CONFIGURED_VARIABLES "${CONFIGURED_VARIABLES}\n// ${CACHE_HELPSTRING}\n") + if (${${v}}) + set(CONFIGURED_VARIABLES "${CONFIGURED_VARIABLES}#define ${v}\n") + else() + set(CONFIGURED_VARIABLES "${CONFIGURED_VARIABLES}/* #undef ${v} */\n") + endif() + endif() +endforeach() +configure_file("${CONFIG_FILE_IN}" "${CONFIG_FILE_OUT}") + +message(STATUS "") -add_subdirectory(core) -add_subdirectory(backends) diff --git a/ThirdParty/soci/LICENSE_1_0.txt b/ThirdParty/soci/src/LICENSE_1_0.txt similarity index 100% rename from ThirdParty/soci/LICENSE_1_0.txt rename to ThirdParty/soci/src/LICENSE_1_0.txt diff --git a/ThirdParty/soci/README.md b/ThirdParty/soci/src/README.md similarity index 100% rename from ThirdParty/soci/README.md rename to ThirdParty/soci/src/README.md diff --git a/ThirdParty/soci/TODO b/ThirdParty/soci/src/TODO similarity index 100% rename from ThirdParty/soci/TODO rename to ThirdParty/soci/src/TODO diff --git a/ThirdParty/soci/Vagrantfile b/ThirdParty/soci/src/Vagrantfile similarity index 100% rename from ThirdParty/soci/Vagrantfile rename to ThirdParty/soci/src/Vagrantfile diff --git a/ThirdParty/soci/appveyor.yml b/ThirdParty/soci/src/appveyor.yml similarity index 100% rename from ThirdParty/soci/appveyor.yml rename to ThirdParty/soci/src/appveyor.yml diff --git a/ThirdParty/soci/cmake/.gitignore b/ThirdParty/soci/src/cmake/.gitignore similarity index 100% rename from ThirdParty/soci/cmake/.gitignore rename to ThirdParty/soci/src/cmake/.gitignore diff --git a/ThirdParty/soci/cmake/CMakeLists.txt b/ThirdParty/soci/src/cmake/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/cmake/CMakeLists.txt rename to ThirdParty/soci/src/cmake/CMakeLists.txt diff --git a/ThirdParty/soci/cmake/SociBackend.cmake b/ThirdParty/soci/src/cmake/SociBackend.cmake similarity index 100% rename from ThirdParty/soci/cmake/SociBackend.cmake rename to ThirdParty/soci/src/cmake/SociBackend.cmake diff --git a/ThirdParty/soci/cmake/SociConfig.cmake b/ThirdParty/soci/src/cmake/SociConfig.cmake similarity index 100% rename from ThirdParty/soci/cmake/SociConfig.cmake rename to ThirdParty/soci/src/cmake/SociConfig.cmake diff --git a/ThirdParty/soci/cmake/SociDependencies.cmake b/ThirdParty/soci/src/cmake/SociDependencies.cmake similarity index 100% rename from ThirdParty/soci/cmake/SociDependencies.cmake rename to ThirdParty/soci/src/cmake/SociDependencies.cmake diff --git a/ThirdParty/soci/cmake/SociUtilities.cmake b/ThirdParty/soci/src/cmake/SociUtilities.cmake similarity index 100% rename from ThirdParty/soci/cmake/SociUtilities.cmake rename to ThirdParty/soci/src/cmake/SociUtilities.cmake diff --git a/ThirdParty/soci/cmake/SociVersion.cmake b/ThirdParty/soci/src/cmake/SociVersion.cmake similarity index 100% rename from ThirdParty/soci/cmake/SociVersion.cmake rename to ThirdParty/soci/src/cmake/SociVersion.cmake diff --git a/ThirdParty/soci/cmake/configs/test-access.cmake b/ThirdParty/soci/src/cmake/configs/test-access.cmake similarity index 100% rename from ThirdParty/soci/cmake/configs/test-access.cmake rename to ThirdParty/soci/src/cmake/configs/test-access.cmake diff --git a/ThirdParty/soci/cmake/configs/test-mysql.cmake b/ThirdParty/soci/src/cmake/configs/test-mysql.cmake similarity index 100% rename from ThirdParty/soci/cmake/configs/test-mysql.cmake rename to ThirdParty/soci/src/cmake/configs/test-mysql.cmake diff --git a/ThirdParty/soci/cmake/dependencies/Boost.cmake b/ThirdParty/soci/src/cmake/dependencies/Boost.cmake similarity index 100% rename from ThirdParty/soci/cmake/dependencies/Boost.cmake rename to ThirdParty/soci/src/cmake/dependencies/Boost.cmake diff --git a/ThirdParty/soci/cmake/dependencies/DB2.cmake b/ThirdParty/soci/src/cmake/dependencies/DB2.cmake similarity index 100% rename from ThirdParty/soci/cmake/dependencies/DB2.cmake rename to ThirdParty/soci/src/cmake/dependencies/DB2.cmake diff --git a/ThirdParty/soci/cmake/dependencies/Firebird.cmake b/ThirdParty/soci/src/cmake/dependencies/Firebird.cmake similarity index 100% rename from ThirdParty/soci/cmake/dependencies/Firebird.cmake rename to ThirdParty/soci/src/cmake/dependencies/Firebird.cmake diff --git a/ThirdParty/soci/cmake/dependencies/MySQL.cmake b/ThirdParty/soci/src/cmake/dependencies/MySQL.cmake similarity index 100% rename from ThirdParty/soci/cmake/dependencies/MySQL.cmake rename to ThirdParty/soci/src/cmake/dependencies/MySQL.cmake diff --git a/ThirdParty/soci/cmake/dependencies/ODBC.cmake b/ThirdParty/soci/src/cmake/dependencies/ODBC.cmake similarity index 100% rename from ThirdParty/soci/cmake/dependencies/ODBC.cmake rename to ThirdParty/soci/src/cmake/dependencies/ODBC.cmake diff --git a/ThirdParty/soci/cmake/dependencies/Oracle.cmake b/ThirdParty/soci/src/cmake/dependencies/Oracle.cmake similarity index 100% rename from ThirdParty/soci/cmake/dependencies/Oracle.cmake rename to ThirdParty/soci/src/cmake/dependencies/Oracle.cmake diff --git a/ThirdParty/soci/cmake/dependencies/PostgreSQL.cmake b/ThirdParty/soci/src/cmake/dependencies/PostgreSQL.cmake similarity index 100% rename from ThirdParty/soci/cmake/dependencies/PostgreSQL.cmake rename to ThirdParty/soci/src/cmake/dependencies/PostgreSQL.cmake diff --git a/ThirdParty/soci/cmake/dependencies/SQLite3.cmake b/ThirdParty/soci/src/cmake/dependencies/SQLite3.cmake similarity index 100% rename from ThirdParty/soci/cmake/dependencies/SQLite3.cmake rename to ThirdParty/soci/src/cmake/dependencies/SQLite3.cmake diff --git a/ThirdParty/soci/cmake/dependencies/Threads.cmake b/ThirdParty/soci/src/cmake/dependencies/Threads.cmake similarity index 100% rename from ThirdParty/soci/cmake/dependencies/Threads.cmake rename to ThirdParty/soci/src/cmake/dependencies/Threads.cmake diff --git a/ThirdParty/soci/cmake/modules/FindDB2.cmake b/ThirdParty/soci/src/cmake/modules/FindDB2.cmake similarity index 100% rename from ThirdParty/soci/cmake/modules/FindDB2.cmake rename to ThirdParty/soci/src/cmake/modules/FindDB2.cmake diff --git a/ThirdParty/soci/cmake/modules/FindDL.cmake b/ThirdParty/soci/src/cmake/modules/FindDL.cmake similarity index 100% rename from ThirdParty/soci/cmake/modules/FindDL.cmake rename to ThirdParty/soci/src/cmake/modules/FindDL.cmake diff --git a/ThirdParty/soci/cmake/modules/FindFirebird.cmake b/ThirdParty/soci/src/cmake/modules/FindFirebird.cmake similarity index 100% rename from ThirdParty/soci/cmake/modules/FindFirebird.cmake rename to ThirdParty/soci/src/cmake/modules/FindFirebird.cmake diff --git a/ThirdParty/soci/cmake/modules/FindMySQL.cmake b/ThirdParty/soci/src/cmake/modules/FindMySQL.cmake similarity index 100% rename from ThirdParty/soci/cmake/modules/FindMySQL.cmake rename to ThirdParty/soci/src/cmake/modules/FindMySQL.cmake diff --git a/ThirdParty/soci/cmake/modules/FindODBC.cmake b/ThirdParty/soci/src/cmake/modules/FindODBC.cmake similarity index 100% rename from ThirdParty/soci/cmake/modules/FindODBC.cmake rename to ThirdParty/soci/src/cmake/modules/FindODBC.cmake diff --git a/ThirdParty/soci/cmake/modules/FindOracle.cmake b/ThirdParty/soci/src/cmake/modules/FindOracle.cmake similarity index 100% rename from ThirdParty/soci/cmake/modules/FindOracle.cmake rename to ThirdParty/soci/src/cmake/modules/FindOracle.cmake diff --git a/ThirdParty/soci/cmake/modules/FindPostgreSQL.cmake b/ThirdParty/soci/src/cmake/modules/FindPostgreSQL.cmake similarity index 100% rename from ThirdParty/soci/cmake/modules/FindPostgreSQL.cmake rename to ThirdParty/soci/src/cmake/modules/FindPostgreSQL.cmake diff --git a/ThirdParty/soci/cmake/modules/FindSQLite3.cmake b/ThirdParty/soci/src/cmake/modules/FindSQLite3.cmake similarity index 100% rename from ThirdParty/soci/cmake/modules/FindSQLite3.cmake rename to ThirdParty/soci/src/cmake/modules/FindSQLite3.cmake diff --git a/ThirdParty/soci/cmake/modules/FindSoci.cmake b/ThirdParty/soci/src/cmake/modules/FindSoci.cmake similarity index 100% rename from ThirdParty/soci/cmake/modules/FindSoci.cmake rename to ThirdParty/soci/src/cmake/modules/FindSoci.cmake diff --git a/ThirdParty/soci/cmake/resources/vs2010-test-cmd-args.vcxproj.user.in b/ThirdParty/soci/src/cmake/resources/vs2010-test-cmd-args.vcxproj.user.in similarity index 100% rename from ThirdParty/soci/cmake/resources/vs2010-test-cmd-args.vcxproj.user.in rename to ThirdParty/soci/src/cmake/resources/vs2010-test-cmd-args.vcxproj.user.in diff --git a/ThirdParty/soci/docs/api/backend.md b/ThirdParty/soci/src/docs/api/backend.md similarity index 100% rename from ThirdParty/soci/docs/api/backend.md rename to ThirdParty/soci/src/docs/api/backend.md diff --git a/ThirdParty/soci/docs/api/client.md b/ThirdParty/soci/src/docs/api/client.md similarity index 100% rename from ThirdParty/soci/docs/api/client.md rename to ThirdParty/soci/src/docs/api/client.md diff --git a/ThirdParty/soci/docs/backends/db2.md b/ThirdParty/soci/src/docs/backends/db2.md similarity index 100% rename from ThirdParty/soci/docs/backends/db2.md rename to ThirdParty/soci/src/docs/backends/db2.md diff --git a/ThirdParty/soci/docs/backends/firebird.md b/ThirdParty/soci/src/docs/backends/firebird.md similarity index 100% rename from ThirdParty/soci/docs/backends/firebird.md rename to ThirdParty/soci/src/docs/backends/firebird.md diff --git a/ThirdParty/soci/docs/backends/index.md b/ThirdParty/soci/src/docs/backends/index.md similarity index 100% rename from ThirdParty/soci/docs/backends/index.md rename to ThirdParty/soci/src/docs/backends/index.md diff --git a/ThirdParty/soci/docs/backends/mysql.md b/ThirdParty/soci/src/docs/backends/mysql.md similarity index 100% rename from ThirdParty/soci/docs/backends/mysql.md rename to ThirdParty/soci/src/docs/backends/mysql.md diff --git a/ThirdParty/soci/docs/backends/odbc.md b/ThirdParty/soci/src/docs/backends/odbc.md similarity index 100% rename from ThirdParty/soci/docs/backends/odbc.md rename to ThirdParty/soci/src/docs/backends/odbc.md diff --git a/ThirdParty/soci/docs/backends/oracle.md b/ThirdParty/soci/src/docs/backends/oracle.md similarity index 100% rename from ThirdParty/soci/docs/backends/oracle.md rename to ThirdParty/soci/src/docs/backends/oracle.md diff --git a/ThirdParty/soci/docs/backends/postgresql.md b/ThirdParty/soci/src/docs/backends/postgresql.md similarity index 100% rename from ThirdParty/soci/docs/backends/postgresql.md rename to ThirdParty/soci/src/docs/backends/postgresql.md diff --git a/ThirdParty/soci/docs/backends/sqlite3.md b/ThirdParty/soci/src/docs/backends/sqlite3.md similarity index 100% rename from ThirdParty/soci/docs/backends/sqlite3.md rename to ThirdParty/soci/src/docs/backends/sqlite3.md diff --git a/ThirdParty/soci/docs/beyond.md b/ThirdParty/soci/src/docs/beyond.md similarity index 100% rename from ThirdParty/soci/docs/beyond.md rename to ThirdParty/soci/src/docs/beyond.md diff --git a/ThirdParty/soci/docs/binding.md b/ThirdParty/soci/src/docs/binding.md similarity index 100% rename from ThirdParty/soci/docs/binding.md rename to ThirdParty/soci/src/docs/binding.md diff --git a/ThirdParty/soci/docs/boost.md b/ThirdParty/soci/src/docs/boost.md similarity index 100% rename from ThirdParty/soci/docs/boost.md rename to ThirdParty/soci/src/docs/boost.md diff --git a/ThirdParty/soci/docs/connections.md b/ThirdParty/soci/src/docs/connections.md similarity index 100% rename from ThirdParty/soci/docs/connections.md rename to ThirdParty/soci/src/docs/connections.md diff --git a/ThirdParty/soci/docs/errors.md b/ThirdParty/soci/src/docs/errors.md similarity index 100% rename from ThirdParty/soci/docs/errors.md rename to ThirdParty/soci/src/docs/errors.md diff --git a/ThirdParty/soci/docs/faq.md b/ThirdParty/soci/src/docs/faq.md similarity index 100% rename from ThirdParty/soci/docs/faq.md rename to ThirdParty/soci/src/docs/faq.md diff --git a/ThirdParty/soci/docs/images/structure.png b/ThirdParty/soci/src/docs/images/structure.png similarity index 100% rename from ThirdParty/soci/docs/images/structure.png rename to ThirdParty/soci/src/docs/images/structure.png diff --git a/ThirdParty/soci/docs/index.md b/ThirdParty/soci/src/docs/index.md similarity index 100% rename from ThirdParty/soci/docs/index.md rename to ThirdParty/soci/src/docs/index.md diff --git a/ThirdParty/soci/docs/indicators.md b/ThirdParty/soci/src/docs/indicators.md similarity index 100% rename from ThirdParty/soci/docs/indicators.md rename to ThirdParty/soci/src/docs/indicators.md diff --git a/ThirdParty/soci/docs/installation.md b/ThirdParty/soci/src/docs/installation.md similarity index 100% rename from ThirdParty/soci/docs/installation.md rename to ThirdParty/soci/src/docs/installation.md diff --git a/ThirdParty/soci/docs/interfaces.md b/ThirdParty/soci/src/docs/interfaces.md similarity index 100% rename from ThirdParty/soci/docs/interfaces.md rename to ThirdParty/soci/src/docs/interfaces.md diff --git a/ThirdParty/soci/docs/languages/ada/concepts.md b/ThirdParty/soci/src/docs/languages/ada/concepts.md similarity index 100% rename from ThirdParty/soci/docs/languages/ada/concepts.md rename to ThirdParty/soci/src/docs/languages/ada/concepts.md diff --git a/ThirdParty/soci/docs/languages/ada/idioms.md b/ThirdParty/soci/src/docs/languages/ada/idioms.md similarity index 100% rename from ThirdParty/soci/docs/languages/ada/idioms.md rename to ThirdParty/soci/src/docs/languages/ada/idioms.md diff --git a/ThirdParty/soci/docs/languages/ada/index.md b/ThirdParty/soci/src/docs/languages/ada/index.md similarity index 100% rename from ThirdParty/soci/docs/languages/ada/index.md rename to ThirdParty/soci/src/docs/languages/ada/index.md diff --git a/ThirdParty/soci/docs/languages/ada/reference.md b/ThirdParty/soci/src/docs/languages/ada/reference.md similarity index 100% rename from ThirdParty/soci/docs/languages/ada/reference.md rename to ThirdParty/soci/src/docs/languages/ada/reference.md diff --git a/ThirdParty/soci/docs/languages/index.md b/ThirdParty/soci/src/docs/languages/index.md similarity index 100% rename from ThirdParty/soci/docs/languages/index.md rename to ThirdParty/soci/src/docs/languages/index.md diff --git a/ThirdParty/soci/docs/license.md b/ThirdParty/soci/src/docs/license.md similarity index 100% rename from ThirdParty/soci/docs/license.md rename to ThirdParty/soci/src/docs/license.md diff --git a/ThirdParty/soci/docs/lobs.md b/ThirdParty/soci/src/docs/lobs.md similarity index 100% rename from ThirdParty/soci/docs/lobs.md rename to ThirdParty/soci/src/docs/lobs.md diff --git a/ThirdParty/soci/docs/logging.md b/ThirdParty/soci/src/docs/logging.md similarity index 100% rename from ThirdParty/soci/docs/logging.md rename to ThirdParty/soci/src/docs/logging.md diff --git a/ThirdParty/soci/docs/multithreading.md b/ThirdParty/soci/src/docs/multithreading.md similarity index 100% rename from ThirdParty/soci/docs/multithreading.md rename to ThirdParty/soci/src/docs/multithreading.md diff --git a/ThirdParty/soci/docs/procedures.md b/ThirdParty/soci/src/docs/procedures.md similarity index 100% rename from ThirdParty/soci/docs/procedures.md rename to ThirdParty/soci/src/docs/procedures.md diff --git a/ThirdParty/soci/docs/queries.md b/ThirdParty/soci/src/docs/queries.md similarity index 100% rename from ThirdParty/soci/docs/queries.md rename to ThirdParty/soci/src/docs/queries.md diff --git a/ThirdParty/soci/docs/quickstart.md b/ThirdParty/soci/src/docs/quickstart.md similarity index 100% rename from ThirdParty/soci/docs/quickstart.md rename to ThirdParty/soci/src/docs/quickstart.md diff --git a/ThirdParty/soci/docs/statements.md b/ThirdParty/soci/src/docs/statements.md similarity index 100% rename from ThirdParty/soci/docs/statements.md rename to ThirdParty/soci/src/docs/statements.md diff --git a/ThirdParty/soci/docs/structure.md b/ThirdParty/soci/src/docs/structure.md similarity index 100% rename from ThirdParty/soci/docs/structure.md rename to ThirdParty/soci/src/docs/structure.md diff --git a/ThirdParty/soci/docs/transactions.md b/ThirdParty/soci/src/docs/transactions.md similarity index 100% rename from ThirdParty/soci/docs/transactions.md rename to ThirdParty/soci/src/docs/transactions.md diff --git a/ThirdParty/soci/docs/types.md b/ThirdParty/soci/src/docs/types.md similarity index 100% rename from ThirdParty/soci/docs/types.md rename to ThirdParty/soci/src/docs/types.md diff --git a/ThirdParty/soci/docs/utilities.md b/ThirdParty/soci/src/docs/utilities.md similarity index 100% rename from ThirdParty/soci/docs/utilities.md rename to ThirdParty/soci/src/docs/utilities.md diff --git a/ThirdParty/soci/docs/vagrant.md b/ThirdParty/soci/src/docs/vagrant.md similarity index 100% rename from ThirdParty/soci/docs/vagrant.md rename to ThirdParty/soci/src/docs/vagrant.md diff --git a/ThirdParty/soci/include/private/README.md b/ThirdParty/soci/src/include/private/README.md similarity index 100% rename from ThirdParty/soci/include/private/README.md rename to ThirdParty/soci/src/include/private/README.md diff --git a/ThirdParty/soci/include/private/firebird/common.h b/ThirdParty/soci/src/include/private/firebird/common.h similarity index 100% rename from ThirdParty/soci/include/private/firebird/common.h rename to ThirdParty/soci/src/include/private/firebird/common.h diff --git a/ThirdParty/soci/include/private/firebird/error-firebird.h b/ThirdParty/soci/src/include/private/firebird/error-firebird.h similarity index 100% rename from ThirdParty/soci/include/private/firebird/error-firebird.h rename to ThirdParty/soci/src/include/private/firebird/error-firebird.h diff --git a/ThirdParty/soci/include/private/soci-compiler.h b/ThirdParty/soci/src/include/private/soci-compiler.h similarity index 100% rename from ThirdParty/soci/include/private/soci-compiler.h rename to ThirdParty/soci/src/include/private/soci-compiler.h diff --git a/ThirdParty/soci/include/private/soci-cpp.h b/ThirdParty/soci/src/include/private/soci-cpp.h similarity index 100% rename from ThirdParty/soci/include/private/soci-cpp.h rename to ThirdParty/soci/src/include/private/soci-cpp.h diff --git a/ThirdParty/soci/include/private/soci-cstrtod.h b/ThirdParty/soci/src/include/private/soci-cstrtod.h similarity index 100% rename from ThirdParty/soci/include/private/soci-cstrtod.h rename to ThirdParty/soci/src/include/private/soci-cstrtod.h diff --git a/ThirdParty/soci/include/private/soci-dtocstr.h b/ThirdParty/soci/src/include/private/soci-dtocstr.h similarity index 100% rename from ThirdParty/soci/include/private/soci-dtocstr.h rename to ThirdParty/soci/src/include/private/soci-dtocstr.h diff --git a/ThirdParty/soci/include/private/soci-exchange-cast.h b/ThirdParty/soci/src/include/private/soci-exchange-cast.h similarity index 100% rename from ThirdParty/soci/include/private/soci-exchange-cast.h rename to ThirdParty/soci/src/include/private/soci-exchange-cast.h diff --git a/ThirdParty/soci/include/private/soci-mktime.h b/ThirdParty/soci/src/include/private/soci-mktime.h similarity index 100% rename from ThirdParty/soci/include/private/soci-mktime.h rename to ThirdParty/soci/src/include/private/soci-mktime.h diff --git a/ThirdParty/soci/include/private/soci-static-assert.h b/ThirdParty/soci/src/include/private/soci-static-assert.h similarity index 100% rename from ThirdParty/soci/include/private/soci-static-assert.h rename to ThirdParty/soci/src/include/private/soci-static-assert.h diff --git a/ThirdParty/soci/include/soci/backend-loader.h b/ThirdParty/soci/src/include/soci/backend-loader.h similarity index 100% rename from ThirdParty/soci/include/soci/backend-loader.h rename to ThirdParty/soci/src/include/soci/backend-loader.h diff --git a/ThirdParty/soci/include/soci/bind-values.h b/ThirdParty/soci/src/include/soci/bind-values.h similarity index 100% rename from ThirdParty/soci/include/soci/bind-values.h rename to ThirdParty/soci/src/include/soci/bind-values.h diff --git a/ThirdParty/soci/include/soci/blob-exchange.h b/ThirdParty/soci/src/include/soci/blob-exchange.h similarity index 100% rename from ThirdParty/soci/include/soci/blob-exchange.h rename to ThirdParty/soci/src/include/soci/blob-exchange.h diff --git a/ThirdParty/soci/include/soci/blob.h b/ThirdParty/soci/src/include/soci/blob.h similarity index 100% rename from ThirdParty/soci/include/soci/blob.h rename to ThirdParty/soci/src/include/soci/blob.h diff --git a/ThirdParty/soci/include/soci/boost-fusion.h b/ThirdParty/soci/src/include/soci/boost-fusion.h similarity index 100% rename from ThirdParty/soci/include/soci/boost-fusion.h rename to ThirdParty/soci/src/include/soci/boost-fusion.h diff --git a/ThirdParty/soci/include/soci/boost-gregorian-date.h b/ThirdParty/soci/src/include/soci/boost-gregorian-date.h similarity index 100% rename from ThirdParty/soci/include/soci/boost-gregorian-date.h rename to ThirdParty/soci/src/include/soci/boost-gregorian-date.h diff --git a/ThirdParty/soci/include/soci/boost-optional.h b/ThirdParty/soci/src/include/soci/boost-optional.h similarity index 100% rename from ThirdParty/soci/include/soci/boost-optional.h rename to ThirdParty/soci/src/include/soci/boost-optional.h diff --git a/ThirdParty/soci/include/soci/boost-tuple.h b/ThirdParty/soci/src/include/soci/boost-tuple.h similarity index 100% rename from ThirdParty/soci/include/soci/boost-tuple.h rename to ThirdParty/soci/src/include/soci/boost-tuple.h diff --git a/ThirdParty/soci/include/soci/callbacks.h b/ThirdParty/soci/src/include/soci/callbacks.h similarity index 100% rename from ThirdParty/soci/include/soci/callbacks.h rename to ThirdParty/soci/src/include/soci/callbacks.h diff --git a/ThirdParty/soci/include/soci/column-info.h b/ThirdParty/soci/src/include/soci/column-info.h similarity index 100% rename from ThirdParty/soci/include/soci/column-info.h rename to ThirdParty/soci/src/include/soci/column-info.h diff --git a/ThirdParty/soci/include/soci/connection-parameters.h b/ThirdParty/soci/src/include/soci/connection-parameters.h similarity index 100% rename from ThirdParty/soci/include/soci/connection-parameters.h rename to ThirdParty/soci/src/include/soci/connection-parameters.h diff --git a/ThirdParty/soci/include/soci/connection-pool.h b/ThirdParty/soci/src/include/soci/connection-pool.h similarity index 100% rename from ThirdParty/soci/include/soci/connection-pool.h rename to ThirdParty/soci/src/include/soci/connection-pool.h diff --git a/ThirdParty/soci/include/soci/db2/soci-db2.h b/ThirdParty/soci/src/include/soci/db2/soci-db2.h similarity index 100% rename from ThirdParty/soci/include/soci/db2/soci-db2.h rename to ThirdParty/soci/src/include/soci/db2/soci-db2.h diff --git a/ThirdParty/soci/include/soci/empty/soci-empty.h b/ThirdParty/soci/src/include/soci/empty/soci-empty.h similarity index 100% rename from ThirdParty/soci/include/soci/empty/soci-empty.h rename to ThirdParty/soci/src/include/soci/empty/soci-empty.h diff --git a/ThirdParty/soci/include/soci/error.h b/ThirdParty/soci/src/include/soci/error.h similarity index 100% rename from ThirdParty/soci/include/soci/error.h rename to ThirdParty/soci/src/include/soci/error.h diff --git a/ThirdParty/soci/include/soci/exchange-traits.h b/ThirdParty/soci/src/include/soci/exchange-traits.h similarity index 100% rename from ThirdParty/soci/include/soci/exchange-traits.h rename to ThirdParty/soci/src/include/soci/exchange-traits.h diff --git a/ThirdParty/soci/include/soci/firebird/soci-firebird.h b/ThirdParty/soci/src/include/soci/firebird/soci-firebird.h similarity index 100% rename from ThirdParty/soci/include/soci/firebird/soci-firebird.h rename to ThirdParty/soci/src/include/soci/firebird/soci-firebird.h diff --git a/ThirdParty/soci/include/soci/into-type.h b/ThirdParty/soci/src/include/soci/into-type.h similarity index 100% rename from ThirdParty/soci/include/soci/into-type.h rename to ThirdParty/soci/src/include/soci/into-type.h diff --git a/ThirdParty/soci/include/soci/into.h b/ThirdParty/soci/src/include/soci/into.h similarity index 100% rename from ThirdParty/soci/include/soci/into.h rename to ThirdParty/soci/src/include/soci/into.h diff --git a/ThirdParty/soci/include/soci/logger.h b/ThirdParty/soci/src/include/soci/logger.h similarity index 100% rename from ThirdParty/soci/include/soci/logger.h rename to ThirdParty/soci/src/include/soci/logger.h diff --git a/ThirdParty/soci/include/soci/mysql/soci-mysql.h b/ThirdParty/soci/src/include/soci/mysql/soci-mysql.h similarity index 100% rename from ThirdParty/soci/include/soci/mysql/soci-mysql.h rename to ThirdParty/soci/src/include/soci/mysql/soci-mysql.h diff --git a/ThirdParty/soci/include/soci/noreturn.h b/ThirdParty/soci/src/include/soci/noreturn.h similarity index 100% rename from ThirdParty/soci/include/soci/noreturn.h rename to ThirdParty/soci/src/include/soci/noreturn.h diff --git a/ThirdParty/soci/include/soci/odbc/soci-odbc.h b/ThirdParty/soci/src/include/soci/odbc/soci-odbc.h similarity index 100% rename from ThirdParty/soci/include/soci/odbc/soci-odbc.h rename to ThirdParty/soci/src/include/soci/odbc/soci-odbc.h diff --git a/ThirdParty/soci/include/soci/once-temp-type.h b/ThirdParty/soci/src/include/soci/once-temp-type.h similarity index 100% rename from ThirdParty/soci/include/soci/once-temp-type.h rename to ThirdParty/soci/src/include/soci/once-temp-type.h diff --git a/ThirdParty/soci/include/soci/oracle/soci-oracle.h b/ThirdParty/soci/src/include/soci/oracle/soci-oracle.h similarity index 100% rename from ThirdParty/soci/include/soci/oracle/soci-oracle.h rename to ThirdParty/soci/src/include/soci/oracle/soci-oracle.h diff --git a/ThirdParty/soci/include/soci/postgresql/soci-postgresql.h b/ThirdParty/soci/src/include/soci/postgresql/soci-postgresql.h similarity index 100% rename from ThirdParty/soci/include/soci/postgresql/soci-postgresql.h rename to ThirdParty/soci/src/include/soci/postgresql/soci-postgresql.h diff --git a/ThirdParty/soci/include/soci/prepare-temp-type.h b/ThirdParty/soci/src/include/soci/prepare-temp-type.h similarity index 100% rename from ThirdParty/soci/include/soci/prepare-temp-type.h rename to ThirdParty/soci/src/include/soci/prepare-temp-type.h diff --git a/ThirdParty/soci/include/soci/procedure.h b/ThirdParty/soci/src/include/soci/procedure.h similarity index 100% rename from ThirdParty/soci/include/soci/procedure.h rename to ThirdParty/soci/src/include/soci/procedure.h diff --git a/ThirdParty/soci/include/soci/query_transformation.h b/ThirdParty/soci/src/include/soci/query_transformation.h similarity index 100% rename from ThirdParty/soci/include/soci/query_transformation.h rename to ThirdParty/soci/src/include/soci/query_transformation.h diff --git a/ThirdParty/soci/include/soci/ref-counted-prepare-info.h b/ThirdParty/soci/src/include/soci/ref-counted-prepare-info.h similarity index 100% rename from ThirdParty/soci/include/soci/ref-counted-prepare-info.h rename to ThirdParty/soci/src/include/soci/ref-counted-prepare-info.h diff --git a/ThirdParty/soci/include/soci/ref-counted-statement.h b/ThirdParty/soci/src/include/soci/ref-counted-statement.h similarity index 100% rename from ThirdParty/soci/include/soci/ref-counted-statement.h rename to ThirdParty/soci/src/include/soci/ref-counted-statement.h diff --git a/ThirdParty/soci/include/soci/row-exchange.h b/ThirdParty/soci/src/include/soci/row-exchange.h similarity index 100% rename from ThirdParty/soci/include/soci/row-exchange.h rename to ThirdParty/soci/src/include/soci/row-exchange.h diff --git a/ThirdParty/soci/include/soci/row.h b/ThirdParty/soci/src/include/soci/row.h similarity index 100% rename from ThirdParty/soci/include/soci/row.h rename to ThirdParty/soci/src/include/soci/row.h diff --git a/ThirdParty/soci/include/soci/rowid-exchange.h b/ThirdParty/soci/src/include/soci/rowid-exchange.h similarity index 100% rename from ThirdParty/soci/include/soci/rowid-exchange.h rename to ThirdParty/soci/src/include/soci/rowid-exchange.h diff --git a/ThirdParty/soci/include/soci/rowid.h b/ThirdParty/soci/src/include/soci/rowid.h similarity index 100% rename from ThirdParty/soci/include/soci/rowid.h rename to ThirdParty/soci/src/include/soci/rowid.h diff --git a/ThirdParty/soci/include/soci/rowset.h b/ThirdParty/soci/src/include/soci/rowset.h similarity index 100% rename from ThirdParty/soci/include/soci/rowset.h rename to ThirdParty/soci/src/include/soci/rowset.h diff --git a/ThirdParty/soci/include/soci/session.h b/ThirdParty/soci/src/include/soci/session.h similarity index 100% rename from ThirdParty/soci/include/soci/session.h rename to ThirdParty/soci/src/include/soci/session.h diff --git a/ThirdParty/soci/include/soci/soci-backend.h b/ThirdParty/soci/src/include/soci/soci-backend.h similarity index 100% rename from ThirdParty/soci/include/soci/soci-backend.h rename to ThirdParty/soci/src/include/soci/soci-backend.h diff --git a/ThirdParty/soci/include/soci/soci-config.h.in b/ThirdParty/soci/src/include/soci/soci-config.h.in similarity index 100% rename from ThirdParty/soci/include/soci/soci-config.h.in rename to ThirdParty/soci/src/include/soci/soci-config.h.in diff --git a/ThirdParty/soci/include/soci/soci-platform.h b/ThirdParty/soci/src/include/soci/soci-platform.h similarity index 100% rename from ThirdParty/soci/include/soci/soci-platform.h rename to ThirdParty/soci/src/include/soci/soci-platform.h diff --git a/ThirdParty/soci/include/soci/soci-simple.h b/ThirdParty/soci/src/include/soci/soci-simple.h similarity index 100% rename from ThirdParty/soci/include/soci/soci-simple.h rename to ThirdParty/soci/src/include/soci/soci-simple.h diff --git a/ThirdParty/soci/include/soci/soci.h b/ThirdParty/soci/src/include/soci/soci.h similarity index 100% rename from ThirdParty/soci/include/soci/soci.h rename to ThirdParty/soci/src/include/soci/soci.h diff --git a/ThirdParty/soci/include/soci/sqlite3/soci-sqlite3.h b/ThirdParty/soci/src/include/soci/sqlite3/soci-sqlite3.h similarity index 100% rename from ThirdParty/soci/include/soci/sqlite3/soci-sqlite3.h rename to ThirdParty/soci/src/include/soci/sqlite3/soci-sqlite3.h diff --git a/ThirdParty/soci/include/soci/statement.h b/ThirdParty/soci/src/include/soci/statement.h similarity index 100% rename from ThirdParty/soci/include/soci/statement.h rename to ThirdParty/soci/src/include/soci/statement.h diff --git a/ThirdParty/soci/include/soci/transaction.h b/ThirdParty/soci/src/include/soci/transaction.h similarity index 100% rename from ThirdParty/soci/include/soci/transaction.h rename to ThirdParty/soci/src/include/soci/transaction.h diff --git a/ThirdParty/soci/include/soci/type-conversion-traits.h b/ThirdParty/soci/src/include/soci/type-conversion-traits.h similarity index 100% rename from ThirdParty/soci/include/soci/type-conversion-traits.h rename to ThirdParty/soci/src/include/soci/type-conversion-traits.h diff --git a/ThirdParty/soci/include/soci/type-conversion.h b/ThirdParty/soci/src/include/soci/type-conversion.h similarity index 100% rename from ThirdParty/soci/include/soci/type-conversion.h rename to ThirdParty/soci/src/include/soci/type-conversion.h diff --git a/ThirdParty/soci/include/soci/type-holder.h b/ThirdParty/soci/src/include/soci/type-holder.h similarity index 100% rename from ThirdParty/soci/include/soci/type-holder.h rename to ThirdParty/soci/src/include/soci/type-holder.h diff --git a/ThirdParty/soci/include/soci/type-ptr.h b/ThirdParty/soci/src/include/soci/type-ptr.h similarity index 100% rename from ThirdParty/soci/include/soci/type-ptr.h rename to ThirdParty/soci/src/include/soci/type-ptr.h diff --git a/ThirdParty/soci/include/soci/type-wrappers.h b/ThirdParty/soci/src/include/soci/type-wrappers.h similarity index 100% rename from ThirdParty/soci/include/soci/type-wrappers.h rename to ThirdParty/soci/src/include/soci/type-wrappers.h diff --git a/ThirdParty/soci/include/soci/unsigned-types.h b/ThirdParty/soci/src/include/soci/unsigned-types.h similarity index 100% rename from ThirdParty/soci/include/soci/unsigned-types.h rename to ThirdParty/soci/src/include/soci/unsigned-types.h diff --git a/ThirdParty/soci/include/soci/use-type.h b/ThirdParty/soci/src/include/soci/use-type.h similarity index 100% rename from ThirdParty/soci/include/soci/use-type.h rename to ThirdParty/soci/src/include/soci/use-type.h diff --git a/ThirdParty/soci/include/soci/use.h b/ThirdParty/soci/src/include/soci/use.h similarity index 100% rename from ThirdParty/soci/include/soci/use.h rename to ThirdParty/soci/src/include/soci/use.h diff --git a/ThirdParty/soci/include/soci/values-exchange.h b/ThirdParty/soci/src/include/soci/values-exchange.h similarity index 100% rename from ThirdParty/soci/include/soci/values-exchange.h rename to ThirdParty/soci/src/include/soci/values-exchange.h diff --git a/ThirdParty/soci/include/soci/values.h b/ThirdParty/soci/src/include/soci/values.h similarity index 100% rename from ThirdParty/soci/include/soci/values.h rename to ThirdParty/soci/src/include/soci/values.h diff --git a/ThirdParty/soci/include/soci/version.h b/ThirdParty/soci/src/include/soci/version.h similarity index 100% rename from ThirdParty/soci/include/soci/version.h rename to ThirdParty/soci/src/include/soci/version.h diff --git a/ThirdParty/soci/languages/ada/postgresql_client.gpr b/ThirdParty/soci/src/languages/ada/postgresql_client.gpr similarity index 100% rename from ThirdParty/soci/languages/ada/postgresql_client.gpr rename to ThirdParty/soci/src/languages/ada/postgresql_client.gpr diff --git a/ThirdParty/soci/languages/ada/soci-mysql.ads b/ThirdParty/soci/src/languages/ada/soci-mysql.ads similarity index 100% rename from ThirdParty/soci/languages/ada/soci-mysql.ads rename to ThirdParty/soci/src/languages/ada/soci-mysql.ads diff --git a/ThirdParty/soci/languages/ada/soci-oracle.ads b/ThirdParty/soci/src/languages/ada/soci-oracle.ads similarity index 100% rename from ThirdParty/soci/languages/ada/soci-oracle.ads rename to ThirdParty/soci/src/languages/ada/soci-oracle.ads diff --git a/ThirdParty/soci/languages/ada/soci-postgresql.ads b/ThirdParty/soci/src/languages/ada/soci-postgresql.ads similarity index 100% rename from ThirdParty/soci/languages/ada/soci-postgresql.ads rename to ThirdParty/soci/src/languages/ada/soci-postgresql.ads diff --git a/ThirdParty/soci/languages/ada/soci.adb b/ThirdParty/soci/src/languages/ada/soci.adb similarity index 100% rename from ThirdParty/soci/languages/ada/soci.adb rename to ThirdParty/soci/src/languages/ada/soci.adb diff --git a/ThirdParty/soci/languages/ada/soci.ads b/ThirdParty/soci/src/languages/ada/soci.ads similarity index 100% rename from ThirdParty/soci/languages/ada/soci.ads rename to ThirdParty/soci/src/languages/ada/soci.ads diff --git a/ThirdParty/soci/languages/ada/soci_ada.gpr b/ThirdParty/soci/src/languages/ada/soci_ada.gpr similarity index 100% rename from ThirdParty/soci/languages/ada/soci_ada.gpr rename to ThirdParty/soci/src/languages/ada/soci_ada.gpr diff --git a/ThirdParty/soci/languages/ada/soci_core.gpr b/ThirdParty/soci/src/languages/ada/soci_core.gpr similarity index 100% rename from ThirdParty/soci/languages/ada/soci_core.gpr rename to ThirdParty/soci/src/languages/ada/soci_core.gpr diff --git a/ThirdParty/soci/languages/ada/soci_postgresql.gpr b/ThirdParty/soci/src/languages/ada/soci_postgresql.gpr similarity index 100% rename from ThirdParty/soci/languages/ada/soci_postgresql.gpr rename to ThirdParty/soci/src/languages/ada/soci_postgresql.gpr diff --git a/ThirdParty/soci/languages/ada/std_cpp.gpr b/ThirdParty/soci/src/languages/ada/std_cpp.gpr similarity index 100% rename from ThirdParty/soci/languages/ada/std_cpp.gpr rename to ThirdParty/soci/src/languages/ada/std_cpp.gpr diff --git a/ThirdParty/soci/languages/ada/test/postgresql_test.adb b/ThirdParty/soci/src/languages/ada/test/postgresql_test.adb similarity index 100% rename from ThirdParty/soci/languages/ada/test/postgresql_test.adb rename to ThirdParty/soci/src/languages/ada/test/postgresql_test.adb diff --git a/ThirdParty/soci/languages/ada/test/postgresql_test.gpr b/ThirdParty/soci/src/languages/ada/test/postgresql_test.gpr similarity index 100% rename from ThirdParty/soci/languages/ada/test/postgresql_test.gpr rename to ThirdParty/soci/src/languages/ada/test/postgresql_test.gpr diff --git a/ThirdParty/soci/mkdocs.yml b/ThirdParty/soci/src/mkdocs.yml similarity index 100% rename from ThirdParty/soci/mkdocs.yml rename to ThirdParty/soci/src/mkdocs.yml diff --git a/ThirdParty/soci/scripts/build.bat b/ThirdParty/soci/src/scripts/build.bat similarity index 100% rename from ThirdParty/soci/scripts/build.bat rename to ThirdParty/soci/src/scripts/build.bat diff --git a/ThirdParty/soci/scripts/changelog.sh b/ThirdParty/soci/src/scripts/changelog.sh similarity index 100% rename from ThirdParty/soci/scripts/changelog.sh rename to ThirdParty/soci/src/scripts/changelog.sh diff --git a/ThirdParty/soci/scripts/travis/before_install.sh b/ThirdParty/soci/src/scripts/travis/before_install.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_install.sh rename to ThirdParty/soci/src/scripts/travis/before_install.sh diff --git a/ThirdParty/soci/scripts/travis/before_install_db2.sh b/ThirdParty/soci/src/scripts/travis/before_install_db2.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_install_db2.sh rename to ThirdParty/soci/src/scripts/travis/before_install_db2.sh diff --git a/ThirdParty/soci/scripts/travis/before_install_firebird.sh b/ThirdParty/soci/src/scripts/travis/before_install_firebird.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_install_firebird.sh rename to ThirdParty/soci/src/scripts/travis/before_install_firebird.sh diff --git a/ThirdParty/soci/scripts/travis/before_install_odbc.sh b/ThirdParty/soci/src/scripts/travis/before_install_odbc.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_install_odbc.sh rename to ThirdParty/soci/src/scripts/travis/before_install_odbc.sh diff --git a/ThirdParty/soci/scripts/travis/before_install_oracle.sh b/ThirdParty/soci/src/scripts/travis/before_install_oracle.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_install_oracle.sh rename to ThirdParty/soci/src/scripts/travis/before_install_oracle.sh diff --git a/ThirdParty/soci/scripts/travis/before_script.sh b/ThirdParty/soci/src/scripts/travis/before_script.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_script.sh rename to ThirdParty/soci/src/scripts/travis/before_script.sh diff --git a/ThirdParty/soci/scripts/travis/before_script_db2.sh b/ThirdParty/soci/src/scripts/travis/before_script_db2.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_script_db2.sh rename to ThirdParty/soci/src/scripts/travis/before_script_db2.sh diff --git a/ThirdParty/soci/scripts/travis/before_script_firebird.sh b/ThirdParty/soci/src/scripts/travis/before_script_firebird.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_script_firebird.sh rename to ThirdParty/soci/src/scripts/travis/before_script_firebird.sh diff --git a/ThirdParty/soci/scripts/travis/before_script_mysql.sh b/ThirdParty/soci/src/scripts/travis/before_script_mysql.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_script_mysql.sh rename to ThirdParty/soci/src/scripts/travis/before_script_mysql.sh diff --git a/ThirdParty/soci/scripts/travis/before_script_odbc.sh b/ThirdParty/soci/src/scripts/travis/before_script_odbc.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_script_odbc.sh rename to ThirdParty/soci/src/scripts/travis/before_script_odbc.sh diff --git a/ThirdParty/soci/scripts/travis/before_script_oracle.sh b/ThirdParty/soci/src/scripts/travis/before_script_oracle.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_script_oracle.sh rename to ThirdParty/soci/src/scripts/travis/before_script_oracle.sh diff --git a/ThirdParty/soci/scripts/travis/before_script_postgresql.sh b/ThirdParty/soci/src/scripts/travis/before_script_postgresql.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_script_postgresql.sh rename to ThirdParty/soci/src/scripts/travis/before_script_postgresql.sh diff --git a/ThirdParty/soci/scripts/travis/before_script_valgrind.sh b/ThirdParty/soci/src/scripts/travis/before_script_valgrind.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/before_script_valgrind.sh rename to ThirdParty/soci/src/scripts/travis/before_script_valgrind.sh diff --git a/ThirdParty/soci/scripts/travis/common.sh b/ThirdParty/soci/src/scripts/travis/common.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/common.sh rename to ThirdParty/soci/src/scripts/travis/common.sh diff --git a/ThirdParty/soci/scripts/travis/install_cmake.sh b/ThirdParty/soci/src/scripts/travis/install_cmake.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/install_cmake.sh rename to ThirdParty/soci/src/scripts/travis/install_cmake.sh diff --git a/ThirdParty/soci/scripts/travis/oracle.sh b/ThirdParty/soci/src/scripts/travis/oracle.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/oracle.sh rename to ThirdParty/soci/src/scripts/travis/oracle.sh diff --git a/ThirdParty/soci/scripts/travis/script.sh b/ThirdParty/soci/src/scripts/travis/script.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script.sh rename to ThirdParty/soci/src/scripts/travis/script.sh diff --git a/ThirdParty/soci/scripts/travis/script_db2.sh b/ThirdParty/soci/src/scripts/travis/script_db2.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script_db2.sh rename to ThirdParty/soci/src/scripts/travis/script_db2.sh diff --git a/ThirdParty/soci/scripts/travis/script_empty.sh b/ThirdParty/soci/src/scripts/travis/script_empty.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script_empty.sh rename to ThirdParty/soci/src/scripts/travis/script_empty.sh diff --git a/ThirdParty/soci/scripts/travis/script_firebird.sh b/ThirdParty/soci/src/scripts/travis/script_firebird.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script_firebird.sh rename to ThirdParty/soci/src/scripts/travis/script_firebird.sh diff --git a/ThirdParty/soci/scripts/travis/script_mysql.sh b/ThirdParty/soci/src/scripts/travis/script_mysql.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script_mysql.sh rename to ThirdParty/soci/src/scripts/travis/script_mysql.sh diff --git a/ThirdParty/soci/scripts/travis/script_odbc.sh b/ThirdParty/soci/src/scripts/travis/script_odbc.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script_odbc.sh rename to ThirdParty/soci/src/scripts/travis/script_odbc.sh diff --git a/ThirdParty/soci/scripts/travis/script_oracle.sh b/ThirdParty/soci/src/scripts/travis/script_oracle.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script_oracle.sh rename to ThirdParty/soci/src/scripts/travis/script_oracle.sh diff --git a/ThirdParty/soci/scripts/travis/script_postgresql.sh b/ThirdParty/soci/src/scripts/travis/script_postgresql.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script_postgresql.sh rename to ThirdParty/soci/src/scripts/travis/script_postgresql.sh diff --git a/ThirdParty/soci/scripts/travis/script_sqlite3.sh b/ThirdParty/soci/src/scripts/travis/script_sqlite3.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script_sqlite3.sh rename to ThirdParty/soci/src/scripts/travis/script_sqlite3.sh diff --git a/ThirdParty/soci/scripts/travis/script_valgrind.sh b/ThirdParty/soci/src/scripts/travis/script_valgrind.sh similarity index 100% rename from ThirdParty/soci/scripts/travis/script_valgrind.sh rename to ThirdParty/soci/src/scripts/travis/script_valgrind.sh diff --git a/ThirdParty/soci/scripts/vagrant/bootstrap.sh b/ThirdParty/soci/src/scripts/vagrant/bootstrap.sh similarity index 100% rename from ThirdParty/soci/scripts/vagrant/bootstrap.sh rename to ThirdParty/soci/src/scripts/vagrant/bootstrap.sh diff --git a/ThirdParty/soci/scripts/vagrant/build.sh b/ThirdParty/soci/src/scripts/vagrant/build.sh similarity index 100% rename from ThirdParty/soci/scripts/vagrant/build.sh rename to ThirdParty/soci/src/scripts/vagrant/build.sh diff --git a/ThirdParty/soci/scripts/vagrant/common.env b/ThirdParty/soci/src/scripts/vagrant/common.env similarity index 100% rename from ThirdParty/soci/scripts/vagrant/common.env rename to ThirdParty/soci/src/scripts/vagrant/common.env diff --git a/ThirdParty/soci/scripts/vagrant/db2.sh b/ThirdParty/soci/src/scripts/vagrant/db2.sh similarity index 100% rename from ThirdParty/soci/scripts/vagrant/db2.sh rename to ThirdParty/soci/src/scripts/vagrant/db2.sh diff --git a/ThirdParty/soci/scripts/vagrant/db2cli.sh b/ThirdParty/soci/src/scripts/vagrant/db2cli.sh similarity index 100% rename from ThirdParty/soci/scripts/vagrant/db2cli.sh rename to ThirdParty/soci/src/scripts/vagrant/db2cli.sh diff --git a/ThirdParty/soci/scripts/vagrant/devel.sh b/ThirdParty/soci/src/scripts/vagrant/devel.sh similarity index 100% rename from ThirdParty/soci/scripts/vagrant/devel.sh rename to ThirdParty/soci/src/scripts/vagrant/devel.sh diff --git a/ThirdParty/soci/scripts/vagrant/firebird.sh b/ThirdParty/soci/src/scripts/vagrant/firebird.sh similarity index 100% rename from ThirdParty/soci/scripts/vagrant/firebird.sh rename to ThirdParty/soci/src/scripts/vagrant/firebird.sh diff --git a/ThirdParty/soci/scripts/vagrant/mysql.sh b/ThirdParty/soci/src/scripts/vagrant/mysql.sh similarity index 100% rename from ThirdParty/soci/scripts/vagrant/mysql.sh rename to ThirdParty/soci/src/scripts/vagrant/mysql.sh diff --git a/ThirdParty/soci/scripts/vagrant/postgresql.sh b/ThirdParty/soci/src/scripts/vagrant/postgresql.sh similarity index 100% rename from ThirdParty/soci/scripts/vagrant/postgresql.sh rename to ThirdParty/soci/src/scripts/vagrant/postgresql.sh diff --git a/ThirdParty/soci/scripts/vm/debian-oracle10g-install.sh b/ThirdParty/soci/src/scripts/vm/debian-oracle10g-install.sh similarity index 100% rename from ThirdParty/soci/scripts/vm/debian-oracle10g-install.sh rename to ThirdParty/soci/src/scripts/vm/debian-oracle10g-install.sh diff --git a/ThirdParty/soci/scripts/windows/Get-ODBCList.ps1 b/ThirdParty/soci/src/scripts/windows/Get-ODBCList.ps1 similarity index 100% rename from ThirdParty/soci/scripts/windows/Get-ODBCList.ps1 rename to ThirdParty/soci/src/scripts/windows/Get-ODBCList.ps1 diff --git a/ThirdParty/soci/scripts/windows/mssql_db_create.sql b/ThirdParty/soci/src/scripts/windows/mssql_db_create.sql similarity index 100% rename from ThirdParty/soci/scripts/windows/mssql_db_create.sql rename to ThirdParty/soci/src/scripts/windows/mssql_db_create.sql diff --git a/ThirdParty/soci/src/src/.gitignore b/ThirdParty/soci/src/src/.gitignore new file mode 100644 index 0000000..4746d47 --- /dev/null +++ b/ThirdParty/soci/src/src/.gitignore @@ -0,0 +1,20 @@ +*~ +*.kdev[0-9] +*.swp +aclocal.m4 +autom4te.cache +confdefs.h +config.guess +config.log +config.status +config.sub +configure +depcomp +install-sh +libtool +ltmain.sh +m4 +missing +Makefile +Makefile.in +tmp diff --git a/ThirdParty/soci/src/src/CMakeLists.txt b/ThirdParty/soci/src/src/CMakeLists.txt new file mode 100644 index 0000000..472ae86 --- /dev/null +++ b/ThirdParty/soci/src/src/CMakeLists.txt @@ -0,0 +1,14 @@ +############################################################################### +# +# This file is part of CMake configuration for SOCI library +# +# Copyright (C) 2013 Mateusz Loskot +# Distributed under the Boost Software License, Version 1.0. +# (See accompanying file LICENSE_1_0.txt or copy at +# http://www.boost.org/LICENSE_1_0.txt) +# +############################################################################### +include_directories(${SOCI_SOURCE_DIR}/include/private) + +add_subdirectory(core) +add_subdirectory(backends) diff --git a/ThirdParty/soci/src/backends/.gitignore b/ThirdParty/soci/src/src/backends/.gitignore similarity index 100% rename from ThirdParty/soci/src/backends/.gitignore rename to ThirdParty/soci/src/src/backends/.gitignore diff --git a/ThirdParty/soci/src/backends/CMakeLists.txt b/ThirdParty/soci/src/src/backends/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/backends/CMakeLists.txt rename to ThirdParty/soci/src/src/backends/CMakeLists.txt diff --git a/ThirdParty/soci/src/backends/db2/CMakeLists.txt b/ThirdParty/soci/src/src/backends/db2/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/backends/db2/CMakeLists.txt rename to ThirdParty/soci/src/src/backends/db2/CMakeLists.txt diff --git a/ThirdParty/soci/src/backends/db2/blob.cpp b/ThirdParty/soci/src/src/backends/db2/blob.cpp similarity index 100% rename from ThirdParty/soci/src/backends/db2/blob.cpp rename to ThirdParty/soci/src/src/backends/db2/blob.cpp diff --git a/ThirdParty/soci/src/backends/db2/common.h b/ThirdParty/soci/src/src/backends/db2/common.h similarity index 100% rename from ThirdParty/soci/src/backends/db2/common.h rename to ThirdParty/soci/src/src/backends/db2/common.h diff --git a/ThirdParty/soci/src/backends/db2/factory.cpp b/ThirdParty/soci/src/src/backends/db2/factory.cpp similarity index 100% rename from ThirdParty/soci/src/backends/db2/factory.cpp rename to ThirdParty/soci/src/src/backends/db2/factory.cpp diff --git a/ThirdParty/soci/src/backends/db2/row-id.cpp b/ThirdParty/soci/src/src/backends/db2/row-id.cpp similarity index 100% rename from ThirdParty/soci/src/backends/db2/row-id.cpp rename to ThirdParty/soci/src/src/backends/db2/row-id.cpp diff --git a/ThirdParty/soci/src/backends/db2/session.cpp b/ThirdParty/soci/src/src/backends/db2/session.cpp similarity index 100% rename from ThirdParty/soci/src/backends/db2/session.cpp rename to ThirdParty/soci/src/src/backends/db2/session.cpp diff --git a/ThirdParty/soci/src/backends/db2/standard-into-type.cpp b/ThirdParty/soci/src/src/backends/db2/standard-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/db2/standard-into-type.cpp rename to ThirdParty/soci/src/src/backends/db2/standard-into-type.cpp diff --git a/ThirdParty/soci/src/backends/db2/standard-use-type.cpp b/ThirdParty/soci/src/src/backends/db2/standard-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/db2/standard-use-type.cpp rename to ThirdParty/soci/src/src/backends/db2/standard-use-type.cpp diff --git a/ThirdParty/soci/src/backends/db2/statement.cpp b/ThirdParty/soci/src/src/backends/db2/statement.cpp similarity index 100% rename from ThirdParty/soci/src/backends/db2/statement.cpp rename to ThirdParty/soci/src/src/backends/db2/statement.cpp diff --git a/ThirdParty/soci/src/backends/db2/vector-into-type.cpp b/ThirdParty/soci/src/src/backends/db2/vector-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/db2/vector-into-type.cpp rename to ThirdParty/soci/src/src/backends/db2/vector-into-type.cpp diff --git a/ThirdParty/soci/src/backends/db2/vector-use-type.cpp b/ThirdParty/soci/src/src/backends/db2/vector-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/db2/vector-use-type.cpp rename to ThirdParty/soci/src/src/backends/db2/vector-use-type.cpp diff --git a/ThirdParty/soci/src/backends/empty/CMakeLists.txt b/ThirdParty/soci/src/src/backends/empty/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/backends/empty/CMakeLists.txt rename to ThirdParty/soci/src/src/backends/empty/CMakeLists.txt diff --git a/ThirdParty/soci/src/backends/empty/Makefile.basic b/ThirdParty/soci/src/src/backends/empty/Makefile.basic similarity index 100% rename from ThirdParty/soci/src/backends/empty/Makefile.basic rename to ThirdParty/soci/src/src/backends/empty/Makefile.basic diff --git a/ThirdParty/soci/src/backends/empty/blob.cpp b/ThirdParty/soci/src/src/backends/empty/blob.cpp similarity index 100% rename from ThirdParty/soci/src/backends/empty/blob.cpp rename to ThirdParty/soci/src/src/backends/empty/blob.cpp diff --git a/ThirdParty/soci/src/backends/empty/factory.cpp b/ThirdParty/soci/src/src/backends/empty/factory.cpp similarity index 100% rename from ThirdParty/soci/src/backends/empty/factory.cpp rename to ThirdParty/soci/src/src/backends/empty/factory.cpp diff --git a/ThirdParty/soci/src/backends/empty/row-id.cpp b/ThirdParty/soci/src/src/backends/empty/row-id.cpp similarity index 100% rename from ThirdParty/soci/src/backends/empty/row-id.cpp rename to ThirdParty/soci/src/src/backends/empty/row-id.cpp diff --git a/ThirdParty/soci/src/backends/empty/session.cpp b/ThirdParty/soci/src/src/backends/empty/session.cpp similarity index 100% rename from ThirdParty/soci/src/backends/empty/session.cpp rename to ThirdParty/soci/src/src/backends/empty/session.cpp diff --git a/ThirdParty/soci/src/backends/empty/standard-into-type.cpp b/ThirdParty/soci/src/src/backends/empty/standard-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/empty/standard-into-type.cpp rename to ThirdParty/soci/src/src/backends/empty/standard-into-type.cpp diff --git a/ThirdParty/soci/src/backends/empty/standard-use-type.cpp b/ThirdParty/soci/src/src/backends/empty/standard-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/empty/standard-use-type.cpp rename to ThirdParty/soci/src/src/backends/empty/standard-use-type.cpp diff --git a/ThirdParty/soci/src/backends/empty/statement.cpp b/ThirdParty/soci/src/src/backends/empty/statement.cpp similarity index 100% rename from ThirdParty/soci/src/backends/empty/statement.cpp rename to ThirdParty/soci/src/src/backends/empty/statement.cpp diff --git a/ThirdParty/soci/src/backends/empty/vector-into-type.cpp b/ThirdParty/soci/src/src/backends/empty/vector-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/empty/vector-into-type.cpp rename to ThirdParty/soci/src/src/backends/empty/vector-into-type.cpp diff --git a/ThirdParty/soci/src/backends/empty/vector-use-type.cpp b/ThirdParty/soci/src/src/backends/empty/vector-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/empty/vector-use-type.cpp rename to ThirdParty/soci/src/src/backends/empty/vector-use-type.cpp diff --git a/ThirdParty/soci/src/backends/firebird/CMakeLists.txt b/ThirdParty/soci/src/src/backends/firebird/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/backends/firebird/CMakeLists.txt rename to ThirdParty/soci/src/src/backends/firebird/CMakeLists.txt diff --git a/ThirdParty/soci/src/backends/firebird/Makefile.basic b/ThirdParty/soci/src/src/backends/firebird/Makefile.basic similarity index 100% rename from ThirdParty/soci/src/backends/firebird/Makefile.basic rename to ThirdParty/soci/src/src/backends/firebird/Makefile.basic diff --git a/ThirdParty/soci/src/backends/firebird/blob.cpp b/ThirdParty/soci/src/src/backends/firebird/blob.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/blob.cpp rename to ThirdParty/soci/src/src/backends/firebird/blob.cpp diff --git a/ThirdParty/soci/src/backends/firebird/common.cpp b/ThirdParty/soci/src/src/backends/firebird/common.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/common.cpp rename to ThirdParty/soci/src/src/backends/firebird/common.cpp diff --git a/ThirdParty/soci/src/backends/firebird/error-firebird.cpp b/ThirdParty/soci/src/src/backends/firebird/error-firebird.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/error-firebird.cpp rename to ThirdParty/soci/src/src/backends/firebird/error-firebird.cpp diff --git a/ThirdParty/soci/src/backends/firebird/factory.cpp b/ThirdParty/soci/src/src/backends/firebird/factory.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/factory.cpp rename to ThirdParty/soci/src/src/backends/firebird/factory.cpp diff --git a/ThirdParty/soci/src/backends/firebird/session.cpp b/ThirdParty/soci/src/src/backends/firebird/session.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/session.cpp rename to ThirdParty/soci/src/src/backends/firebird/session.cpp diff --git a/ThirdParty/soci/src/backends/firebird/standard-into-type.cpp b/ThirdParty/soci/src/src/backends/firebird/standard-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/standard-into-type.cpp rename to ThirdParty/soci/src/src/backends/firebird/standard-into-type.cpp diff --git a/ThirdParty/soci/src/backends/firebird/standard-use-type.cpp b/ThirdParty/soci/src/src/backends/firebird/standard-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/standard-use-type.cpp rename to ThirdParty/soci/src/src/backends/firebird/standard-use-type.cpp diff --git a/ThirdParty/soci/src/backends/firebird/statement.cpp b/ThirdParty/soci/src/src/backends/firebird/statement.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/statement.cpp rename to ThirdParty/soci/src/src/backends/firebird/statement.cpp diff --git a/ThirdParty/soci/src/backends/firebird/vector-into-type.cpp b/ThirdParty/soci/src/src/backends/firebird/vector-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/vector-into-type.cpp rename to ThirdParty/soci/src/src/backends/firebird/vector-into-type.cpp diff --git a/ThirdParty/soci/src/backends/firebird/vector-use-type.cpp b/ThirdParty/soci/src/src/backends/firebird/vector-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/firebird/vector-use-type.cpp rename to ThirdParty/soci/src/src/backends/firebird/vector-use-type.cpp diff --git a/ThirdParty/soci/src/backends/mysql/CMakeLists.txt b/ThirdParty/soci/src/src/backends/mysql/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/backends/mysql/CMakeLists.txt rename to ThirdParty/soci/src/src/backends/mysql/CMakeLists.txt diff --git a/ThirdParty/soci/src/backends/mysql/Makefile.basic b/ThirdParty/soci/src/src/backends/mysql/Makefile.basic similarity index 100% rename from ThirdParty/soci/src/backends/mysql/Makefile.basic rename to ThirdParty/soci/src/src/backends/mysql/Makefile.basic diff --git a/ThirdParty/soci/src/backends/mysql/blob.cpp b/ThirdParty/soci/src/src/backends/mysql/blob.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/blob.cpp rename to ThirdParty/soci/src/src/backends/mysql/blob.cpp diff --git a/ThirdParty/soci/src/backends/mysql/common.cpp b/ThirdParty/soci/src/src/backends/mysql/common.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/common.cpp rename to ThirdParty/soci/src/src/backends/mysql/common.cpp diff --git a/ThirdParty/soci/src/backends/mysql/common.h b/ThirdParty/soci/src/src/backends/mysql/common.h similarity index 100% rename from ThirdParty/soci/src/backends/mysql/common.h rename to ThirdParty/soci/src/src/backends/mysql/common.h diff --git a/ThirdParty/soci/src/backends/mysql/factory.cpp b/ThirdParty/soci/src/src/backends/mysql/factory.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/factory.cpp rename to ThirdParty/soci/src/src/backends/mysql/factory.cpp diff --git a/ThirdParty/soci/src/backends/mysql/row-id.cpp b/ThirdParty/soci/src/src/backends/mysql/row-id.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/row-id.cpp rename to ThirdParty/soci/src/src/backends/mysql/row-id.cpp diff --git a/ThirdParty/soci/src/backends/mysql/session.cpp b/ThirdParty/soci/src/src/backends/mysql/session.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/session.cpp rename to ThirdParty/soci/src/src/backends/mysql/session.cpp diff --git a/ThirdParty/soci/src/backends/mysql/standard-into-type.cpp b/ThirdParty/soci/src/src/backends/mysql/standard-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/standard-into-type.cpp rename to ThirdParty/soci/src/src/backends/mysql/standard-into-type.cpp diff --git a/ThirdParty/soci/src/backends/mysql/standard-use-type.cpp b/ThirdParty/soci/src/src/backends/mysql/standard-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/standard-use-type.cpp rename to ThirdParty/soci/src/src/backends/mysql/standard-use-type.cpp diff --git a/ThirdParty/soci/src/backends/mysql/statement.cpp b/ThirdParty/soci/src/src/backends/mysql/statement.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/statement.cpp rename to ThirdParty/soci/src/src/backends/mysql/statement.cpp diff --git a/ThirdParty/soci/src/backends/mysql/vector-into-type.cpp b/ThirdParty/soci/src/src/backends/mysql/vector-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/vector-into-type.cpp rename to ThirdParty/soci/src/src/backends/mysql/vector-into-type.cpp diff --git a/ThirdParty/soci/src/backends/mysql/vector-use-type.cpp b/ThirdParty/soci/src/src/backends/mysql/vector-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/mysql/vector-use-type.cpp rename to ThirdParty/soci/src/src/backends/mysql/vector-use-type.cpp diff --git a/ThirdParty/soci/src/backends/odbc/CMakeLists.txt b/ThirdParty/soci/src/src/backends/odbc/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/backends/odbc/CMakeLists.txt rename to ThirdParty/soci/src/src/backends/odbc/CMakeLists.txt diff --git a/ThirdParty/soci/src/backends/odbc/Makefile.basic b/ThirdParty/soci/src/src/backends/odbc/Makefile.basic similarity index 100% rename from ThirdParty/soci/src/backends/odbc/Makefile.basic rename to ThirdParty/soci/src/src/backends/odbc/Makefile.basic diff --git a/ThirdParty/soci/src/backends/odbc/blob.cpp b/ThirdParty/soci/src/src/backends/odbc/blob.cpp similarity index 100% rename from ThirdParty/soci/src/backends/odbc/blob.cpp rename to ThirdParty/soci/src/src/backends/odbc/blob.cpp diff --git a/ThirdParty/soci/src/backends/odbc/factory.cpp b/ThirdParty/soci/src/src/backends/odbc/factory.cpp similarity index 100% rename from ThirdParty/soci/src/backends/odbc/factory.cpp rename to ThirdParty/soci/src/src/backends/odbc/factory.cpp diff --git a/ThirdParty/soci/src/backends/odbc/makefile.msvc b/ThirdParty/soci/src/src/backends/odbc/makefile.msvc similarity index 100% rename from ThirdParty/soci/src/backends/odbc/makefile.msvc rename to ThirdParty/soci/src/src/backends/odbc/makefile.msvc diff --git a/ThirdParty/soci/src/backends/odbc/row-id.cpp b/ThirdParty/soci/src/src/backends/odbc/row-id.cpp similarity index 100% rename from ThirdParty/soci/src/backends/odbc/row-id.cpp rename to ThirdParty/soci/src/src/backends/odbc/row-id.cpp diff --git a/ThirdParty/soci/src/backends/odbc/session.cpp b/ThirdParty/soci/src/src/backends/odbc/session.cpp similarity index 100% rename from ThirdParty/soci/src/backends/odbc/session.cpp rename to ThirdParty/soci/src/src/backends/odbc/session.cpp diff --git a/ThirdParty/soci/src/backends/odbc/standard-into-type.cpp b/ThirdParty/soci/src/src/backends/odbc/standard-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/odbc/standard-into-type.cpp rename to ThirdParty/soci/src/src/backends/odbc/standard-into-type.cpp diff --git a/ThirdParty/soci/src/backends/odbc/standard-use-type.cpp b/ThirdParty/soci/src/src/backends/odbc/standard-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/odbc/standard-use-type.cpp rename to ThirdParty/soci/src/src/backends/odbc/standard-use-type.cpp diff --git a/ThirdParty/soci/src/backends/odbc/statement.cpp b/ThirdParty/soci/src/src/backends/odbc/statement.cpp similarity index 100% rename from ThirdParty/soci/src/backends/odbc/statement.cpp rename to ThirdParty/soci/src/src/backends/odbc/statement.cpp diff --git a/ThirdParty/soci/src/backends/odbc/utility.h b/ThirdParty/soci/src/src/backends/odbc/utility.h similarity index 100% rename from ThirdParty/soci/src/backends/odbc/utility.h rename to ThirdParty/soci/src/src/backends/odbc/utility.h diff --git a/ThirdParty/soci/src/backends/odbc/vector-into-type.cpp b/ThirdParty/soci/src/src/backends/odbc/vector-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/odbc/vector-into-type.cpp rename to ThirdParty/soci/src/src/backends/odbc/vector-into-type.cpp diff --git a/ThirdParty/soci/src/backends/odbc/vector-use-type.cpp b/ThirdParty/soci/src/src/backends/odbc/vector-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/odbc/vector-use-type.cpp rename to ThirdParty/soci/src/src/backends/odbc/vector-use-type.cpp diff --git a/ThirdParty/soci/src/backends/oracle/CMakeLists.txt b/ThirdParty/soci/src/src/backends/oracle/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/backends/oracle/CMakeLists.txt rename to ThirdParty/soci/src/src/backends/oracle/CMakeLists.txt diff --git a/ThirdParty/soci/src/backends/oracle/Makefile.basic b/ThirdParty/soci/src/src/backends/oracle/Makefile.basic similarity index 100% rename from ThirdParty/soci/src/backends/oracle/Makefile.basic rename to ThirdParty/soci/src/src/backends/oracle/Makefile.basic diff --git a/ThirdParty/soci/src/backends/oracle/blob.cpp b/ThirdParty/soci/src/src/backends/oracle/blob.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/blob.cpp rename to ThirdParty/soci/src/src/backends/oracle/blob.cpp diff --git a/ThirdParty/soci/src/backends/oracle/error.cpp b/ThirdParty/soci/src/src/backends/oracle/error.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/error.cpp rename to ThirdParty/soci/src/src/backends/oracle/error.cpp diff --git a/ThirdParty/soci/src/backends/oracle/error.h b/ThirdParty/soci/src/src/backends/oracle/error.h similarity index 100% rename from ThirdParty/soci/src/backends/oracle/error.h rename to ThirdParty/soci/src/src/backends/oracle/error.h diff --git a/ThirdParty/soci/src/backends/oracle/factory.cpp b/ThirdParty/soci/src/src/backends/oracle/factory.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/factory.cpp rename to ThirdParty/soci/src/src/backends/oracle/factory.cpp diff --git a/ThirdParty/soci/src/backends/oracle/row-id.cpp b/ThirdParty/soci/src/src/backends/oracle/row-id.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/row-id.cpp rename to ThirdParty/soci/src/src/backends/oracle/row-id.cpp diff --git a/ThirdParty/soci/src/backends/oracle/session.cpp b/ThirdParty/soci/src/src/backends/oracle/session.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/session.cpp rename to ThirdParty/soci/src/src/backends/oracle/session.cpp diff --git a/ThirdParty/soci/src/backends/oracle/standard-into-type.cpp b/ThirdParty/soci/src/src/backends/oracle/standard-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/standard-into-type.cpp rename to ThirdParty/soci/src/src/backends/oracle/standard-into-type.cpp diff --git a/ThirdParty/soci/src/backends/oracle/standard-use-type.cpp b/ThirdParty/soci/src/src/backends/oracle/standard-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/standard-use-type.cpp rename to ThirdParty/soci/src/src/backends/oracle/standard-use-type.cpp diff --git a/ThirdParty/soci/src/backends/oracle/statement.cpp b/ThirdParty/soci/src/src/backends/oracle/statement.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/statement.cpp rename to ThirdParty/soci/src/src/backends/oracle/statement.cpp diff --git a/ThirdParty/soci/src/backends/oracle/vector-into-type.cpp b/ThirdParty/soci/src/src/backends/oracle/vector-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/vector-into-type.cpp rename to ThirdParty/soci/src/src/backends/oracle/vector-into-type.cpp diff --git a/ThirdParty/soci/src/backends/oracle/vector-use-type.cpp b/ThirdParty/soci/src/src/backends/oracle/vector-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/oracle/vector-use-type.cpp rename to ThirdParty/soci/src/src/backends/oracle/vector-use-type.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/CMakeLists.txt b/ThirdParty/soci/src/src/backends/postgresql/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/CMakeLists.txt rename to ThirdParty/soci/src/src/backends/postgresql/CMakeLists.txt diff --git a/ThirdParty/soci/src/backends/postgresql/Makefile.basic b/ThirdParty/soci/src/src/backends/postgresql/Makefile.basic similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/Makefile.basic rename to ThirdParty/soci/src/src/backends/postgresql/Makefile.basic diff --git a/ThirdParty/soci/src/backends/postgresql/blob.cpp b/ThirdParty/soci/src/src/backends/postgresql/blob.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/blob.cpp rename to ThirdParty/soci/src/src/backends/postgresql/blob.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/common.h b/ThirdParty/soci/src/src/backends/postgresql/common.h similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/common.h rename to ThirdParty/soci/src/src/backends/postgresql/common.h diff --git a/ThirdParty/soci/src/backends/postgresql/error.cpp b/ThirdParty/soci/src/src/backends/postgresql/error.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/error.cpp rename to ThirdParty/soci/src/src/backends/postgresql/error.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/factory.cpp b/ThirdParty/soci/src/src/backends/postgresql/factory.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/factory.cpp rename to ThirdParty/soci/src/src/backends/postgresql/factory.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/row-id.cpp b/ThirdParty/soci/src/src/backends/postgresql/row-id.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/row-id.cpp rename to ThirdParty/soci/src/src/backends/postgresql/row-id.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/session.cpp b/ThirdParty/soci/src/src/backends/postgresql/session.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/session.cpp rename to ThirdParty/soci/src/src/backends/postgresql/session.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/standard-into-type.cpp b/ThirdParty/soci/src/src/backends/postgresql/standard-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/standard-into-type.cpp rename to ThirdParty/soci/src/src/backends/postgresql/standard-into-type.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/standard-use-type.cpp b/ThirdParty/soci/src/src/backends/postgresql/standard-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/standard-use-type.cpp rename to ThirdParty/soci/src/src/backends/postgresql/standard-use-type.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/statement.cpp b/ThirdParty/soci/src/src/backends/postgresql/statement.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/statement.cpp rename to ThirdParty/soci/src/src/backends/postgresql/statement.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/vector-into-type.cpp b/ThirdParty/soci/src/src/backends/postgresql/vector-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/vector-into-type.cpp rename to ThirdParty/soci/src/src/backends/postgresql/vector-into-type.cpp diff --git a/ThirdParty/soci/src/backends/postgresql/vector-use-type.cpp b/ThirdParty/soci/src/src/backends/postgresql/vector-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/postgresql/vector-use-type.cpp rename to ThirdParty/soci/src/src/backends/postgresql/vector-use-type.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/CMakeLists.txt b/ThirdParty/soci/src/src/backends/sqlite3/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/CMakeLists.txt rename to ThirdParty/soci/src/src/backends/sqlite3/CMakeLists.txt diff --git a/ThirdParty/soci/src/backends/sqlite3/Makefile.basic b/ThirdParty/soci/src/src/backends/sqlite3/Makefile.basic similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/Makefile.basic rename to ThirdParty/soci/src/src/backends/sqlite3/Makefile.basic diff --git a/ThirdParty/soci/src/backends/sqlite3/blob.cpp b/ThirdParty/soci/src/src/backends/sqlite3/blob.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/blob.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/blob.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/common.h b/ThirdParty/soci/src/src/backends/sqlite3/common.h similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/common.h rename to ThirdParty/soci/src/src/backends/sqlite3/common.h diff --git a/ThirdParty/soci/src/backends/sqlite3/error.cpp b/ThirdParty/soci/src/src/backends/sqlite3/error.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/error.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/error.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/factory.cpp b/ThirdParty/soci/src/src/backends/sqlite3/factory.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/factory.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/factory.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/row-id.cpp b/ThirdParty/soci/src/src/backends/sqlite3/row-id.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/row-id.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/row-id.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/session.cpp b/ThirdParty/soci/src/src/backends/sqlite3/session.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/session.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/session.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/standard-into-type.cpp b/ThirdParty/soci/src/src/backends/sqlite3/standard-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/standard-into-type.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/standard-into-type.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/standard-use-type.cpp b/ThirdParty/soci/src/src/backends/sqlite3/standard-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/standard-use-type.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/standard-use-type.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/statement.cpp b/ThirdParty/soci/src/src/backends/sqlite3/statement.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/statement.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/statement.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/vector-into-type.cpp b/ThirdParty/soci/src/src/backends/sqlite3/vector-into-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/vector-into-type.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/vector-into-type.cpp diff --git a/ThirdParty/soci/src/backends/sqlite3/vector-use-type.cpp b/ThirdParty/soci/src/src/backends/sqlite3/vector-use-type.cpp similarity index 100% rename from ThirdParty/soci/src/backends/sqlite3/vector-use-type.cpp rename to ThirdParty/soci/src/src/backends/sqlite3/vector-use-type.cpp diff --git a/ThirdParty/soci/src/core/.gitignore b/ThirdParty/soci/src/src/core/.gitignore similarity index 100% rename from ThirdParty/soci/src/core/.gitignore rename to ThirdParty/soci/src/src/core/.gitignore diff --git a/ThirdParty/soci/src/core/CMakeLists.txt b/ThirdParty/soci/src/src/core/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/src/core/CMakeLists.txt rename to ThirdParty/soci/src/src/core/CMakeLists.txt diff --git a/ThirdParty/soci/src/core/Makefile.basic b/ThirdParty/soci/src/src/core/Makefile.basic similarity index 100% rename from ThirdParty/soci/src/core/Makefile.basic rename to ThirdParty/soci/src/src/core/Makefile.basic diff --git a/ThirdParty/soci/src/core/backend-loader.cpp b/ThirdParty/soci/src/src/core/backend-loader.cpp similarity index 100% rename from ThirdParty/soci/src/core/backend-loader.cpp rename to ThirdParty/soci/src/src/core/backend-loader.cpp diff --git a/ThirdParty/soci/src/core/blob.cpp b/ThirdParty/soci/src/src/core/blob.cpp similarity index 100% rename from ThirdParty/soci/src/core/blob.cpp rename to ThirdParty/soci/src/src/core/blob.cpp diff --git a/ThirdParty/soci/src/core/common.cpp b/ThirdParty/soci/src/src/core/common.cpp similarity index 100% rename from ThirdParty/soci/src/core/common.cpp rename to ThirdParty/soci/src/src/core/common.cpp diff --git a/ThirdParty/soci/src/core/connection-parameters.cpp b/ThirdParty/soci/src/src/core/connection-parameters.cpp similarity index 100% rename from ThirdParty/soci/src/core/connection-parameters.cpp rename to ThirdParty/soci/src/src/core/connection-parameters.cpp diff --git a/ThirdParty/soci/src/core/connection-pool.cpp b/ThirdParty/soci/src/src/core/connection-pool.cpp similarity index 100% rename from ThirdParty/soci/src/core/connection-pool.cpp rename to ThirdParty/soci/src/src/core/connection-pool.cpp diff --git a/ThirdParty/soci/src/core/error.cpp b/ThirdParty/soci/src/src/core/error.cpp similarity index 100% rename from ThirdParty/soci/src/core/error.cpp rename to ThirdParty/soci/src/src/core/error.cpp diff --git a/ThirdParty/soci/src/core/into-type.cpp b/ThirdParty/soci/src/src/core/into-type.cpp similarity index 100% rename from ThirdParty/soci/src/core/into-type.cpp rename to ThirdParty/soci/src/src/core/into-type.cpp diff --git a/ThirdParty/soci/src/core/logger.cpp b/ThirdParty/soci/src/src/core/logger.cpp similarity index 100% rename from ThirdParty/soci/src/core/logger.cpp rename to ThirdParty/soci/src/src/core/logger.cpp diff --git a/ThirdParty/soci/src/core/once-temp-type.cpp b/ThirdParty/soci/src/src/core/once-temp-type.cpp similarity index 100% rename from ThirdParty/soci/src/core/once-temp-type.cpp rename to ThirdParty/soci/src/src/core/once-temp-type.cpp diff --git a/ThirdParty/soci/src/core/prepare-temp-type.cpp b/ThirdParty/soci/src/src/core/prepare-temp-type.cpp similarity index 100% rename from ThirdParty/soci/src/core/prepare-temp-type.cpp rename to ThirdParty/soci/src/src/core/prepare-temp-type.cpp diff --git a/ThirdParty/soci/src/core/procedure.cpp b/ThirdParty/soci/src/src/core/procedure.cpp similarity index 100% rename from ThirdParty/soci/src/core/procedure.cpp rename to ThirdParty/soci/src/src/core/procedure.cpp diff --git a/ThirdParty/soci/src/core/ref-counted-prepare-info.cpp b/ThirdParty/soci/src/src/core/ref-counted-prepare-info.cpp similarity index 100% rename from ThirdParty/soci/src/core/ref-counted-prepare-info.cpp rename to ThirdParty/soci/src/src/core/ref-counted-prepare-info.cpp diff --git a/ThirdParty/soci/src/core/ref-counted-statement.cpp b/ThirdParty/soci/src/src/core/ref-counted-statement.cpp similarity index 100% rename from ThirdParty/soci/src/core/ref-counted-statement.cpp rename to ThirdParty/soci/src/src/core/ref-counted-statement.cpp diff --git a/ThirdParty/soci/src/core/row.cpp b/ThirdParty/soci/src/src/core/row.cpp similarity index 100% rename from ThirdParty/soci/src/core/row.cpp rename to ThirdParty/soci/src/src/core/row.cpp diff --git a/ThirdParty/soci/src/core/rowid.cpp b/ThirdParty/soci/src/src/core/rowid.cpp similarity index 100% rename from ThirdParty/soci/src/core/rowid.cpp rename to ThirdParty/soci/src/src/core/rowid.cpp diff --git a/ThirdParty/soci/src/core/session.cpp b/ThirdParty/soci/src/src/core/session.cpp similarity index 100% rename from ThirdParty/soci/src/core/session.cpp rename to ThirdParty/soci/src/src/core/session.cpp diff --git a/ThirdParty/soci/src/core/soci-simple.cpp b/ThirdParty/soci/src/src/core/soci-simple.cpp similarity index 100% rename from ThirdParty/soci/src/core/soci-simple.cpp rename to ThirdParty/soci/src/src/core/soci-simple.cpp diff --git a/ThirdParty/soci/src/core/soci_backends_config.h.in b/ThirdParty/soci/src/src/core/soci_backends_config.h.in similarity index 100% rename from ThirdParty/soci/src/core/soci_backends_config.h.in rename to ThirdParty/soci/src/src/core/soci_backends_config.h.in diff --git a/ThirdParty/soci/src/core/statement.cpp b/ThirdParty/soci/src/src/core/statement.cpp similarity index 100% rename from ThirdParty/soci/src/core/statement.cpp rename to ThirdParty/soci/src/src/core/statement.cpp diff --git a/ThirdParty/soci/src/core/transaction.cpp b/ThirdParty/soci/src/src/core/transaction.cpp similarity index 100% rename from ThirdParty/soci/src/core/transaction.cpp rename to ThirdParty/soci/src/src/core/transaction.cpp diff --git a/ThirdParty/soci/src/core/use-type.cpp b/ThirdParty/soci/src/src/core/use-type.cpp similarity index 100% rename from ThirdParty/soci/src/core/use-type.cpp rename to ThirdParty/soci/src/src/core/use-type.cpp diff --git a/ThirdParty/soci/src/core/values.cpp b/ThirdParty/soci/src/src/core/values.cpp similarity index 100% rename from ThirdParty/soci/src/core/values.cpp rename to ThirdParty/soci/src/src/core/values.cpp diff --git a/ThirdParty/soci/tests/CMakeLists.txt b/ThirdParty/soci/src/tests/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/tests/CMakeLists.txt rename to ThirdParty/soci/src/tests/CMakeLists.txt diff --git a/ThirdParty/soci/tests/README.md b/ThirdParty/soci/src/tests/README.md similarity index 100% rename from ThirdParty/soci/tests/README.md rename to ThirdParty/soci/src/tests/README.md diff --git a/ThirdParty/soci/tests/catch.hpp b/ThirdParty/soci/src/tests/catch.hpp similarity index 100% rename from ThirdParty/soci/tests/catch.hpp rename to ThirdParty/soci/src/tests/catch.hpp diff --git a/ThirdParty/soci/tests/common-tests.h b/ThirdParty/soci/src/tests/common-tests.h similarity index 100% rename from ThirdParty/soci/tests/common-tests.h rename to ThirdParty/soci/src/tests/common-tests.h diff --git a/ThirdParty/soci/tests/db2/CMakeLists.txt b/ThirdParty/soci/src/tests/db2/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/tests/db2/CMakeLists.txt rename to ThirdParty/soci/src/tests/db2/CMakeLists.txt diff --git a/ThirdParty/soci/tests/db2/test-db2.cpp b/ThirdParty/soci/src/tests/db2/test-db2.cpp similarity index 100% rename from ThirdParty/soci/tests/db2/test-db2.cpp rename to ThirdParty/soci/src/tests/db2/test-db2.cpp diff --git a/ThirdParty/soci/tests/empty/CMakeLists.txt b/ThirdParty/soci/src/tests/empty/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/tests/empty/CMakeLists.txt rename to ThirdParty/soci/src/tests/empty/CMakeLists.txt diff --git a/ThirdParty/soci/tests/empty/test-empty.cpp b/ThirdParty/soci/src/tests/empty/test-empty.cpp similarity index 100% rename from ThirdParty/soci/tests/empty/test-empty.cpp rename to ThirdParty/soci/src/tests/empty/test-empty.cpp diff --git a/ThirdParty/soci/tests/firebird/CMakeLists.txt b/ThirdParty/soci/src/tests/firebird/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/tests/firebird/CMakeLists.txt rename to ThirdParty/soci/src/tests/firebird/CMakeLists.txt diff --git a/ThirdParty/soci/tests/firebird/test-firebird.cpp b/ThirdParty/soci/src/tests/firebird/test-firebird.cpp similarity index 100% rename from ThirdParty/soci/tests/firebird/test-firebird.cpp rename to ThirdParty/soci/src/tests/firebird/test-firebird.cpp diff --git a/ThirdParty/soci/tests/mysql/CMakeLists.txt b/ThirdParty/soci/src/tests/mysql/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/tests/mysql/CMakeLists.txt rename to ThirdParty/soci/src/tests/mysql/CMakeLists.txt diff --git a/ThirdParty/soci/tests/mysql/test-mysql.cpp b/ThirdParty/soci/src/tests/mysql/test-mysql.cpp similarity index 100% rename from ThirdParty/soci/tests/mysql/test-mysql.cpp rename to ThirdParty/soci/src/tests/mysql/test-mysql.cpp diff --git a/ThirdParty/soci/tests/mysql/test-mysql.h b/ThirdParty/soci/src/tests/mysql/test-mysql.h similarity index 100% rename from ThirdParty/soci/tests/mysql/test-mysql.h rename to ThirdParty/soci/src/tests/mysql/test-mysql.h diff --git a/ThirdParty/soci/tests/odbc/CMakeLists.txt b/ThirdParty/soci/src/tests/odbc/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/tests/odbc/CMakeLists.txt rename to ThirdParty/soci/src/tests/odbc/CMakeLists.txt diff --git a/ThirdParty/soci/tests/odbc/soci_test.mdb b/ThirdParty/soci/src/tests/odbc/soci_test.mdb similarity index 100% rename from ThirdParty/soci/tests/odbc/soci_test.mdb rename to ThirdParty/soci/src/tests/odbc/soci_test.mdb diff --git a/ThirdParty/soci/tests/odbc/test-mssql.dsn b/ThirdParty/soci/src/tests/odbc/test-mssql.dsn similarity index 100% rename from ThirdParty/soci/tests/odbc/test-mssql.dsn rename to ThirdParty/soci/src/tests/odbc/test-mssql.dsn diff --git a/ThirdParty/soci/tests/odbc/test-odbc-access.cpp b/ThirdParty/soci/src/tests/odbc/test-odbc-access.cpp similarity index 100% rename from ThirdParty/soci/tests/odbc/test-odbc-access.cpp rename to ThirdParty/soci/src/tests/odbc/test-odbc-access.cpp diff --git a/ThirdParty/soci/tests/odbc/test-odbc-db2.cpp b/ThirdParty/soci/src/tests/odbc/test-odbc-db2.cpp similarity index 100% rename from ThirdParty/soci/tests/odbc/test-odbc-db2.cpp rename to ThirdParty/soci/src/tests/odbc/test-odbc-db2.cpp diff --git a/ThirdParty/soci/tests/odbc/test-odbc-mssql.cpp b/ThirdParty/soci/src/tests/odbc/test-odbc-mssql.cpp similarity index 100% rename from ThirdParty/soci/tests/odbc/test-odbc-mssql.cpp rename to ThirdParty/soci/src/tests/odbc/test-odbc-mssql.cpp diff --git a/ThirdParty/soci/tests/odbc/test-odbc-mysql.cpp b/ThirdParty/soci/src/tests/odbc/test-odbc-mysql.cpp similarity index 100% rename from ThirdParty/soci/tests/odbc/test-odbc-mysql.cpp rename to ThirdParty/soci/src/tests/odbc/test-odbc-mysql.cpp diff --git a/ThirdParty/soci/tests/odbc/test-odbc-postgresql.cpp b/ThirdParty/soci/src/tests/odbc/test-odbc-postgresql.cpp similarity index 100% rename from ThirdParty/soci/tests/odbc/test-odbc-postgresql.cpp rename to ThirdParty/soci/src/tests/odbc/test-odbc-postgresql.cpp diff --git a/ThirdParty/soci/tests/odbc/test-postgresql-win64.dsn b/ThirdParty/soci/src/tests/odbc/test-postgresql-win64.dsn similarity index 100% rename from ThirdParty/soci/tests/odbc/test-postgresql-win64.dsn rename to ThirdParty/soci/src/tests/odbc/test-postgresql-win64.dsn diff --git a/ThirdParty/soci/tests/odbc/test-postgresql.dsn b/ThirdParty/soci/src/tests/odbc/test-postgresql.dsn similarity index 100% rename from ThirdParty/soci/tests/odbc/test-postgresql.dsn rename to ThirdParty/soci/src/tests/odbc/test-postgresql.dsn diff --git a/ThirdParty/soci/tests/oracle/CMakeLists.txt b/ThirdParty/soci/src/tests/oracle/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/tests/oracle/CMakeLists.txt rename to ThirdParty/soci/src/tests/oracle/CMakeLists.txt diff --git a/ThirdParty/soci/tests/oracle/Makefile.basic b/ThirdParty/soci/src/tests/oracle/Makefile.basic similarity index 100% rename from ThirdParty/soci/tests/oracle/Makefile.basic rename to ThirdParty/soci/src/tests/oracle/Makefile.basic diff --git a/ThirdParty/soci/tests/oracle/test-oracle.cpp b/ThirdParty/soci/src/tests/oracle/test-oracle.cpp similarity index 100% rename from ThirdParty/soci/tests/oracle/test-oracle.cpp rename to ThirdParty/soci/src/tests/oracle/test-oracle.cpp diff --git a/ThirdParty/soci/tests/postgresql/CMakeLists.txt b/ThirdParty/soci/src/tests/postgresql/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/tests/postgresql/CMakeLists.txt rename to ThirdParty/soci/src/tests/postgresql/CMakeLists.txt diff --git a/ThirdParty/soci/tests/postgresql/Makefile.basic b/ThirdParty/soci/src/tests/postgresql/Makefile.basic similarity index 100% rename from ThirdParty/soci/tests/postgresql/Makefile.basic rename to ThirdParty/soci/src/tests/postgresql/Makefile.basic diff --git a/ThirdParty/soci/tests/postgresql/test-postgresql.cpp b/ThirdParty/soci/src/tests/postgresql/test-postgresql.cpp similarity index 100% rename from ThirdParty/soci/tests/postgresql/test-postgresql.cpp rename to ThirdParty/soci/src/tests/postgresql/test-postgresql.cpp diff --git a/ThirdParty/soci/tests/sqlite3/CMakeLists.txt b/ThirdParty/soci/src/tests/sqlite3/CMakeLists.txt similarity index 100% rename from ThirdParty/soci/tests/sqlite3/CMakeLists.txt rename to ThirdParty/soci/src/tests/sqlite3/CMakeLists.txt diff --git a/ThirdParty/soci/tests/sqlite3/Makefile.basic b/ThirdParty/soci/src/tests/sqlite3/Makefile.basic similarity index 100% rename from ThirdParty/soci/tests/sqlite3/Makefile.basic rename to ThirdParty/soci/src/tests/sqlite3/Makefile.basic diff --git a/ThirdParty/soci/tests/sqlite3/test-sqlite3.cpp b/ThirdParty/soci/src/tests/sqlite3/test-sqlite3.cpp similarity index 100% rename from ThirdParty/soci/tests/sqlite3/test-sqlite3.cpp rename to ThirdParty/soci/src/tests/sqlite3/test-sqlite3.cpp diff --git a/ThirdParty/soci/valgrind.suppress b/ThirdParty/soci/src/valgrind.suppress similarity index 100% rename from ThirdParty/soci/valgrind.suppress rename to ThirdParty/soci/src/valgrind.suppress diff --git a/ThirdParty/soci/www/articles.html b/ThirdParty/soci/src/www/articles.html similarity index 100% rename from ThirdParty/soci/www/articles.html rename to ThirdParty/soci/src/www/articles.html diff --git a/ThirdParty/soci/www/doc.html b/ThirdParty/soci/src/www/doc.html similarity index 100% rename from ThirdParty/soci/www/doc.html rename to ThirdParty/soci/src/www/doc.html diff --git a/ThirdParty/soci/www/doc/README.md b/ThirdParty/soci/src/www/doc/README.md similarity index 100% rename from ThirdParty/soci/www/doc/README.md rename to ThirdParty/soci/src/www/doc/README.md diff --git a/ThirdParty/soci/www/doc/index.html b/ThirdParty/soci/src/www/doc/index.html similarity index 100% rename from ThirdParty/soci/www/doc/index.html rename to ThirdParty/soci/src/www/doc/index.html diff --git a/ThirdParty/soci/www/events.html b/ThirdParty/soci/src/www/events.html similarity index 100% rename from ThirdParty/soci/www/events.html rename to ThirdParty/soci/src/www/events.html diff --git a/ThirdParty/soci/www/forkus_github.png b/ThirdParty/soci/src/www/forkus_github.png similarity index 100% rename from ThirdParty/soci/www/forkus_github.png rename to ThirdParty/soci/src/www/forkus_github.png diff --git a/ThirdParty/soci/www/index.html b/ThirdParty/soci/src/www/index.html similarity index 100% rename from ThirdParty/soci/www/index.html rename to ThirdParty/soci/src/www/index.html diff --git a/ThirdParty/soci/www/links.html b/ThirdParty/soci/src/www/links.html similarity index 100% rename from ThirdParty/soci/www/links.html rename to ThirdParty/soci/src/www/links.html diff --git a/ThirdParty/soci/www/people.html b/ThirdParty/soci/src/www/people.html similarity index 100% rename from ThirdParty/soci/www/people.html rename to ThirdParty/soci/src/www/people.html diff --git a/ThirdParty/soci/www/style.css b/ThirdParty/soci/src/www/style.css similarity index 100% rename from ThirdParty/soci/www/style.css rename to ThirdParty/soci/src/www/style.css diff --git a/sqlgrep/pch.h b/sqlgrep/pch.h index 068191a..acc7738 100644 --- a/sqlgrep/pch.h +++ b/sqlgrep/pch.h @@ -9,7 +9,7 @@ #include #include "CLI11/CLI11.hpp" #include "termcolor/termcolor.hpp" -#include "soci/include/soci/soci.h" -#include "soci/include/soci/odbc/soci-odbc.h" +#include "soci/src/include/soci/soci.h" +#include "soci/src/include/soci/odbc/soci-odbc.h" #endif //PCH_H diff --git a/sqlgrep/sqlgrep.vcxproj b/sqlgrep/sqlgrep.vcxproj index 96f9258..727e839 100644 --- a/sqlgrep/sqlgrep.vcxproj +++ b/sqlgrep/sqlgrep.vcxproj @@ -60,7 +60,7 @@ _DEBUG;_CONSOLE;_HAS_AUTO_PTR_ETC=1;%(PreprocessorDefinitions) true pch.h - ..\ThirdParty;..\ThirdParty\soci\include;..\ThirdParty\soci\build\include;%(AdditionalIncludeDirectories) + ..\ThirdParty;..\ThirdParty\soci\src\include;..\ThirdParty\soci\build\include;%(AdditionalIncludeDirectories) 4996 stdcpp17 @@ -81,9 +81,10 @@ NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true pch.h - ..\ThirdParty;..\ThirdParty\soci\include;..\ThirdParty\soci\build\include;%(AdditionalIncludeDirectories) + ..\ThirdParty;..\ThirdParty\soci\src\include;..\ThirdParty\soci\build\include;%(AdditionalIncludeDirectories) 4996 stdcpp17 + MultiThreaded Console