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

pocoproject · Feb 13, 2024 · efdae87 · efdae87
1 parent 9e2a50f
commit efdae87
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 10 deletions.
diff --git a/Data/CMakeLists.txt b/Data/CMakeLists.txt
@@ -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)

diff --git a/Data/MySQL/CMakeLists.txt b/Data/MySQL/CMakeLists.txt
@@ -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)
 

diff --git a/Data/ODBC/CMakeLists.txt b/Data/ODBC/CMakeLists.txt
@@ -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)
 

diff --git a/Data/ODBC/testsuite/Makefile b/Data/ODBC/testsuite/Makefile
@@ -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

diff --git a/Data/PostgreSQL/CMakeLists.txt b/Data/PostgreSQL/CMakeLists.txt
@@ -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)

diff --git a/Data/SQLite/CMakeLists.txt b/Data/SQLite/CMakeLists.txt
@@ -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)