Remove MATX_ROOT macro (#937)

cliffburdick · web-flow · commit 27966f2c85ce · 2025-03-27T13:28:54.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -316,7 +316,6 @@ if (MATX_EN_FILEIO OR MATX_EN_VISUALIZATION OR MATX_EN_PYBIND11 OR MATX_BUILD_EX
     set(MATX_EN_PYBIND11 ON)
     target_compile_definitions(matx INTERFACE MATX_ENABLE_PYBIND11)
     target_compile_definitions(matx INTERFACE MATX_ENABLE_FILEIO)
-    target_compile_options(matx INTERFACE -DMATX_ROOT="${PROJECT_SOURCE_DIR}")
 
     include(cmake/GetPyBind11.cmake)
     find_package(Python3  REQUIRED COMPONENTS Interpreter Development)
diff --git a/include/matx/core/pybind.h b/include/matx/core/pybind.h
@@ -39,6 +39,9 @@
 #include <pybind11/embed.h>
 #include <pybind11/numpy.h>
 #include <optional>
+#include <filesystem>
+
+namespace fs = std::filesystem;
 
 namespace matx {
 
@@ -94,7 +97,8 @@ class MatXPybind {
       }
     }
 
-    AddPath(std::string(MATX_ROOT) + GENERATORS_PATH);
+    const auto current_dir = fs::path(__FILE__).parent_path();
+    AddPath((current_dir.string() + "/../../..") + GENERATORS_PATH);
   }
 
   void AddPath(const std::string &path)

Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,9 @@`
`39`	`39`	`#include <pybind11/embed.h>`
`40`	`40`	`#include <pybind11/numpy.h>`
`41`	`41`	`#include <optional>`
	`42`	`+#include <filesystem>`
	`43`	`+`
	`44`	`+namespace fs = std::filesystem;`
`42`	`45`
`43`	`46`	`namespace matx {`
`44`	`47`
`@@ -94,7 +97,8 @@ class MatXPybind {`
`94`	`97`	`}`
`95`	`98`	`}`
`96`	`99`
`97`		`- AddPath(std::string(MATX_ROOT) + GENERATORS_PATH);`
	`100`	`+ const auto current_dir = fs::path(__FILE__).parent_path();`
	`101`	`+ AddPath((current_dir.string() + "/../../..") + GENERATORS_PATH);`
`98`	`102`	`}`
`99`	`103`
`100`	`104`	`void AddPath(const std::string &path)`