mirror of
https://github.com/pocoproject/poco.git
synced 2024-12-13 10:32:57 +01:00
fix(build): ODBC Makefile and Data libs CmakeLists #4453
This commit is contained in:
parent
0088334536
commit
b82fca8337
@ -42,9 +42,9 @@ target_include_directories(Data
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<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}>
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/SQLParser
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/SQLParser/src
|
||||
)
|
||||
|
||||
POCO_INSTALL(Data)
|
||||
|
@ -26,8 +26,6 @@ target_include_directories(DataMySQL
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<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)
|
||||
|
||||
|
@ -26,8 +26,6 @@ target_include_directories(DataODBC
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser/src
|
||||
)
|
||||
target_compile_definitions(DataODBC PUBLIC THREADSAFE)
|
||||
|
||||
|
@ -37,6 +37,7 @@ endif
|
||||
|
||||
ifndef POCO_DATA_NO_SQL_PARSER
|
||||
target_includes += $(POCO_BASE)/Data/SQLParser $(POCO_BASE)/Data/SQLParser/src
|
||||
endif
|
||||
|
||||
target = testrunner
|
||||
target_version = 1
|
||||
|
@ -26,8 +26,6 @@ target_include_directories(DataPostgreSQL
|
||||
PUBLIC
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/SQLParser
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../Data/SQLParser/src
|
||||
)
|
||||
|
||||
POCO_INSTALL(DataPostgreSQL)
|
||||
|
@ -40,8 +40,6 @@ target_include_directories(DataSQLite
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser
|
||||
PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../SQLParser/src
|
||||
)
|
||||
|
||||
if(POCO_UNBUNDLED)
|
||||
|
Loading…
Reference in New Issue
Block a user