generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2024-12-13 10:32:57 +01:00
Code Issues Projects Releases Wiki Activity

fix(build): ODBC Makefile and Data libs CmakeLists #4453

Browse Source
This commit is contained in:
Alex Fabijanic 2024-02-13 20:30:36 +01:00
parent 0088334536
commit b82fca8337
6 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Data/CMakeLists.txt
View File

@ -42,9 +42,9 @@ target_include_directories(Data
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/SQLParser/src>
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/SQLParser>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/SQLParser
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/SQLParser/src
) )
POCO_INSTALL(Data) POCO_INSTALL(Data)

2
Data/MySQL/CMakeLists.txt
View File

@ -26,8 +26,6 @@ target_include_directories(DataMySQL
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser/src
) )
target_compile_definitions(DataMySQL PUBLIC THREADSAFE NO_TCL) target_compile_definitions(DataMySQL PUBLIC THREADSAFE NO_TCL)

2
Data/ODBC/CMakeLists.txt
View File

@ -26,8 +26,6 @@ target_include_directories(DataODBC
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser/src
) )
target_compile_definitions(DataODBC PUBLIC THREADSAFE) target_compile_definitions(DataODBC PUBLIC THREADSAFE)

1
Data/ODBC/testsuite/Makefile
View File

@ -37,6 +37,7 @@ endif
ifndef POCO_DATA_NO_SQL_PARSER ifndef POCO_DATA_NO_SQL_PARSER
target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src
endif
target = testrunner target = testrunner
target_version = 1 target_version = 1

2
Data/PostgreSQL/CMakeLists.txt
View File

@ -26,8 +26,6 @@ target_include_directories(DataPostgreSQL
PUBLIC PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/SQLParser
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/SQLParser/src
) )
POCO_INSTALL(DataPostgreSQL) POCO_INSTALL(DataPostgreSQL)

2
Data/SQLite/CMakeLists.txt
View File

@ -40,8 +40,6 @@ target_include_directories(DataSQLite
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include> $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser/src
) )
if(POCO_UNBUNDLED) if(POCO_UNBUNDLED)