manually importing tinyxml2

Hugoberry · Apr 1, 2024 · 3e7c6eb · 3e7c6eb
1 parent 0029fa3
commit 3e7c6eb
Show file tree

Hide file tree

Showing 19 changed files with 5,436 additions and 21 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -9,7 +9,7 @@ set(TARGET_NAME pbix)
 # used in cmake with find_package. Feel free to remove or replace with other dependencies.
 # Note that it should also be removed from vcpkg.json to prevent needlessly installing it..
 find_package(OpenSSL REQUIRED)
-find_package(tinyxml2 REQUIRED)
+# find_package(tinyxml2 REQUIRED)
 find_package(unofficial-sqlite3 REQUIRED)
 find_package(Crc32c REQUIRED)
 find_package(miniz REQUIRED)
@@ -29,6 +29,7 @@ include_directories(src/include)
 include_directories(src/kaitai)
 include_directories(src/xpress9)
 include_directories(src/abf)
+include_directories(src/third_party)
 
 set(EXTENSION_SOURCES 
     src/abf/AbfParser.cpp
@@ -60,22 +61,22 @@ target_link_libraries(${EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto)
 target_link_libraries(${LOADABLE_EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto)
 
 # Right after defining and linking libraries to ${EXTENSION_NAME}
-target_link_libraries(${EXTENSION_NAME} tinyxml2::tinyxml2)
+# target_link_libraries(${EXTENSION_NAME} tinyxml2::tinyxml2)
 target_link_libraries(${EXTENSION_NAME}  unofficial::sqlite3::sqlite3)
 target_link_libraries(${EXTENSION_NAME} Crc32c::crc32c)
 target_link_libraries(${EXTENSION_NAME}  Threads::Threads)
 target_link_libraries(${EXTENSION_NAME}  miniz::miniz)
 # Add the include directories here
-target_include_directories(${EXTENSION_NAME} PRIVATE ${tinyxml2_INCLUDE_DIRS})
+# target_include_directories(${EXTENSION_NAME} PRIVATE ${tinyxml2_INCLUDE_DIRS})
 
 # And similarly for ${LOADABLE_EXTENSION_NAME}
-target_link_libraries(${LOADABLE_EXTENSION_NAME} tinyxml2::tinyxml2)
+# target_link_libraries(${LOADABLE_EXTENSION_NAME} tinyxml2::tinyxml2)
 target_link_libraries(${LOADABLE_EXTENSION_NAME}  unofficial::sqlite3::sqlite3)
 target_link_libraries(${LOADABLE_EXTENSION_NAME} Crc32c::crc32c)
 target_link_libraries(${LOADABLE_EXTENSION_NAME}  Threads::Threads)
 target_link_libraries(${LOADABLE_EXTENSION_NAME}  miniz::miniz)
 # Add the include directories here
-target_include_directories(${LOADABLE_EXTENSION_NAME} PRIVATE ${tinyxml2_INCLUDE_DIRS})
+# target_include_directories(${LOADABLE_EXTENSION_NAME} PRIVATE ${tinyxml2_INCLUDE_DIRS})
 
 
 install(

diff --git a/src/abf/BackupFile.cpp b/src/abf/BackupFile.cpp
@@ -1,6 +1,6 @@
 // BackupFile.cpp
 #include "BackupFile.h"
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 using namespace tinyxml2;
 

diff --git a/src/abf/BackupFile.h b/src/abf/BackupFile.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <optional>
 #include <iostream>
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 class BackupFile {
 public:

diff --git a/src/abf/BackupLog.h b/src/abf/BackupLog.h
@@ -12,7 +12,7 @@
 #include "FileGroups.h"
 #include <codecvt>
 #include <locale>
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 class BackupLog {
 public:

diff --git a/src/abf/BackupLogHeader.h b/src/abf/BackupLogHeader.h
@@ -7,7 +7,7 @@
 #include <iostream>
 #include <codecvt>
 #include <locale>
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 class BackupLogHeader {
 public:

diff --git a/src/abf/Collations.cpp b/src/abf/Collations.cpp
@@ -1,6 +1,6 @@
 // Collations.cpp
 #include "Collations.h"
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 using namespace tinyxml2;
 

diff --git a/src/abf/Collations.h b/src/abf/Collations.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <optional>
 #include <string>
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 class Collations {
 public:

diff --git a/src/abf/FileGroup.h b/src/abf/FileGroup.h
@@ -4,7 +4,7 @@
 #include <string>
 #include <optional>
 #include "FileList.h"
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 class FileGroup {
 public:

diff --git a/src/abf/FileGroups.cpp b/src/abf/FileGroups.cpp
@@ -1,7 +1,7 @@
 // FileGroups.cpp
 #include "FileGroups.h"
 #include "FileGroup.h"
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 using namespace tinyxml2;
 

diff --git a/src/abf/FileGroups.h b/src/abf/FileGroups.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <optional>
 #include "FileGroup.h"
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 class FileGroups {
 public:

diff --git a/src/abf/FileList.h b/src/abf/FileList.h
@@ -2,7 +2,7 @@
 
 #include <vector>
 #include "LogBackupFile.h"
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 class FileList {
 public:

diff --git a/src/abf/Languages.h b/src/abf/Languages.h
@@ -6,7 +6,7 @@
 #include <optional>
 #include <iostream>
 #include <string>
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 class Languages {
 public:

diff --git a/src/abf/LogBackupFile.cpp b/src/abf/LogBackupFile.cpp
@@ -1,6 +1,6 @@
 // LogBackupFile.cpp
 #include "LogBackupFile.h"
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 using namespace tinyxml2;
 

diff --git a/src/abf/LogBackupFile.h b/src/abf/LogBackupFile.h
@@ -5,7 +5,7 @@
 #include <vector>
 #include <optional>
 #include <iostream>
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 class LogBackupFile {
 public:

diff --git a/src/abf/VirtualDirectory.h b/src/abf/VirtualDirectory.h
@@ -3,7 +3,7 @@
 #include <vector>
 #include <optional>
 #include "BackupFile.h"
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 // VirtualDirectory
 class VirtualDirectory {
 public:

diff --git a/src/include/pbix_extension.hpp b/src/include/pbix_extension.hpp
@@ -2,7 +2,7 @@
 #define DUCKDB_BUILD_LOADABLE_EXTENSION
 #endif
 #include "duckdb.hpp"
-#include "tinyxml2.h"
+#include "../third_party/tinyxml2.h"
 
 #include "duckdb/catalog/catalog.hpp"
 #include "duckdb/parser/parsed_data/create_table_function_info.hpp"