From 5553fe5f706eb87bf2af158002720e355dbde910 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 22 Oct 2023 14:55:03 -0400 Subject: [PATCH 1/3] pyreactor: + pyprintjson dep --- src/pyreactor/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pyreactor/CMakeLists.txt b/src/pyreactor/CMakeLists.txt index ad752e96..b7d5695f 100644 --- a/src/pyreactor/CMakeLists.txt +++ b/src/pyreactor/CMakeLists.txt @@ -6,3 +6,4 @@ set(SELF_SRCS pyreactor.cpp) xo_pybind11_library(${SELF_LIB} ${PROJECT_NAME}Targets ${SELF_SRCS}) xo_pybind11_dependency(${SELF_LIB} reactor) +xo_pybind11_header_dependency(${SELF_LIB} pyprintjson) From db01f8cefc350e9053f9f01cff9909e966e059a4 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 22 Oct 2023 20:26:27 -0400 Subject: [PATCH 2/3] bugfix: varname in .hpp template --- src/pyreactor/pyreactor.hpp.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pyreactor/pyreactor.hpp.in b/src/pyreactor/pyreactor.hpp.in index edbb2e78..140ded1b 100644 --- a/src/pyreactor/pyreactor.hpp.in +++ b/src/pyreactor/pyreactor.hpp.in @@ -8,18 +8,18 @@ * example: * PYBIND11_MODULE(PYREACTOR_MODULE_NAME(), m) { ... } */ -#define PYREACTOR_MODULE_NAME() @SELF_LIBRARY_NAME@ +#define PYREACTOR_MODULE_NAME() @SELF_LIB@ /* example: * py::module_::import(PYREACTOR_MODULE_NAME_STR) */ -#define PYREACTOR_MODULE_NAME_STR "@SELF_LIBRARY_NAME@" +#define PYREACTOR_MODULE_NAME_STR "@SELF_LIB@" /* example: * PYREACTOR_IMPORT_MODULE() * replaces * py::module_::import("pyreactor") */ -#define PYREACTOR_IMPORT_MODULE() py::module_::import("@SELF_LIBRARY_NAME@") +#define PYREACTOR_IMPORT_MODULE() py::module_::import("@SELF_LIB@") /* end pyreactor.hpp */ From 5529e36b8136e98af4cba7c58767c88f1dc3c7e2 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Tue, 24 Oct 2023 17:08:20 -0400 Subject: [PATCH 3/3] build: pyreactor -> xo_pyreactor --- src/pyreactor/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pyreactor/CMakeLists.txt b/src/pyreactor/CMakeLists.txt index b7d5695f..501a2572 100644 --- a/src/pyreactor/CMakeLists.txt +++ b/src/pyreactor/CMakeLists.txt @@ -1,6 +1,6 @@ # xo_pyreactor/src/pyreactor/CMakeLists.txt -set(SELF_LIB pyreactor) +set(SELF_LIB xo_pyreactor) set(SELF_SRCS pyreactor.cpp) xo_pybind11_library(${SELF_LIB} ${PROJECT_NAME}Targets ${SELF_SRCS})