tastytea
/
remwharead
1
0
Fork 0
Code Issues 1 Pull Requests Releases 37 Activity

Add Poco::Data.
continuous-integration/drone/push Build is passing Details

This commit is contained in:
tastytea 2019-08-07 19:52:51 +02:00
parent fafb0c8aa1
commit 84f9c0ad97
Signed by: tastytea
GPG Key ID: CFC39497F1B26E07
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/remwhareadConfig.cmake.in
View File

@ -2,7 +2,7 @@ include(CMakeFindDependencyMacro)
include(GNUInstallDirs) include(GNUInstallDirs)
find_depencency(Poco find_depencency(Poco
COMPONENTS Foundation Net NetSSL DataSQLite COMPONENTS Foundation Net NetSSL Data DataSQLite
CONFIG REQUIRED) CONFIG REQUIRED)
find_dependency(PkgConfig REQUIRED) find_dependency(PkgConfig REQUIRED)
pkg_check_modules(libxdg-basedir REQUIRED IMPORTED_TARGET libxdg-basedir) pkg_check_modules(libxdg-basedir REQUIRED IMPORTED_TARGET libxdg-basedir)

4
pkg-config/remwharead.pc.in
View File

@ -8,6 +8,6 @@ Name: ${name}
Description: @PROJECT_DESCRIPTION@ Description: @PROJECT_DESCRIPTION@
Version: @PROJECT_VERSION@ Version: @PROJECT_VERSION@
Cflags: -I${includedir} Cflags: -I${includedir}
Libs: -L${libdir} -l${name} -lPocoDataSQLite -lstdc++fs Libs: -L${libdir} -l${name} -lPocoData -lstdc++fs
Requires.private: libxdg-basedir, icu-uc, icu-i18n Requires.private: libxdg-basedir, icu-uc, icu-i18n
Libs.private: -lPocoFoundation -lPocoNet -lPocoNetSSL Libs.private: -lPocoFoundation -lPocoNet -lPocoNetSSL -lPocoDataSQLite

10
src/lib/CMakeLists.txt
View File

@ -3,7 +3,7 @@ include(GNUInstallDirs)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(libxdg-basedir REQUIRED IMPORTED_TARGET libxdg-basedir) pkg_check_modules(libxdg-basedir REQUIRED IMPORTED_TARGET libxdg-basedir)
# Some distributions do not contain Poco*Config.cmake recipes. # Some distributions do not contain Poco*Config.cmake recipes.
find_package(Poco COMPONENTS Foundation Net NetSSL DataSQLite CONFIG) find_package(Poco COMPONENTS Foundation Net NetSSL Data DataSQLite CONFIG)
file(GLOB_RECURSE sources_lib *.cpp) file(GLOB_RECURSE sources_lib *.cpp)
file(GLOB_RECURSE headers_lib ../../include/*.hpp) file(GLOB_RECURSE headers_lib ../../include/*.hpp)
@ -28,8 +28,8 @@ target_link_libraries(${PROJECT_NAME}
# If no Poco*Config.cmake recipes are found, look for headers in standard dirs. # If no Poco*Config.cmake recipes are found, look for headers in standard dirs.
if(PocoNetSSL_FOUND) if(PocoNetSSL_FOUND)
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PRIVATE Poco::Foundation Poco::Net Poco::NetSSL PRIVATE Poco::Foundation Poco::Net Poco::NetSSL Poco::DataSQLite
PUBLIC Poco::DataSQLite) PUBLIC Poco::Data)
else() else()
find_file(Poco_h NAMES "Poco/Poco.h" find_file(Poco_h NAMES "Poco/Poco.h"
PATHS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}") PATHS "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
@ -42,8 +42,8 @@ else()
"but the files seem to be in the standard directories. " "but the files seem to be in the standard directories. "
"Let's hope this works.") "Let's hope this works.")
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}
PRIVATE PocoFoundation PocoNet PocoNetSSL PRIVATE PocoFoundation PocoNet PocoNetSSL PocoDataSQLite
PUBLIC PocoDataSQLite) PUBLIC PocoData)
endif() endif()
endif() endif()