Add pybind11_include_file config file directive

RosettaCommons · Oct 25, 2023 · b02d93a · b02d93a
1 parent f1f30b3
commit b02d93a
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 6 deletions.
diff --git a/documentation/config.rst b/documentation/config.rst
@@ -247,3 +247,10 @@ Config file directives:
 .. code-block:: bash
 
   +smart_holder example::class
+
+* ``pybind11_include_file``: use to specify which header file of pybind11 should be included. The header pybind11/pybind11.h is used by default.
+
+.. code-block:: bash
+
+  +pybind11_include_file pybind11/smart_holder.h
+
diff --git a/source/config.cpp b/source/config.cpp
@@ -79,6 +79,8 @@ void Config::read(string const &file_name)
 
 	string const _smart_holder_{"smart_holder"};
 
+	string const _pybind11_include_file_{"pybind11_include_file"};
+
 	string const _default_static_pointer_return_value_policy_{"default_static_pointer_return_value_policy"};
 	string const _default_static_lvalue_reference_return_value_policy_{"default_static_lvalue_reference_return_value_policy"};
 	string const _default_static_rvalue_reference_return_value_policy_{"default_static_rvalue_reference_return_value_policy"};
@@ -219,12 +221,15 @@ void Config::read(string const &file_name)
 		else if( token == _custom_shared_ ) holder_type_ = name_without_spaces;
 
 		else if( token == _smart_holder_ ) {
-			include_file_ = "pybind11/smart_holder.h";
 			if(bind) {
 				smart_held_classes.push_back(name_without_spaces);
 			}
 		}
 
+		else if( token == _pybind11_include_file_ ) {
+			pybind11_include_file_ = name_without_spaces;
+		}
+
 		else if( token == _default_static_pointer_return_value_policy_ ) default_static_pointer_return_value_policy_ = name_without_spaces;
 		else if( token == _default_static_lvalue_reference_return_value_policy_ ) default_static_lvalue_reference_return_value_policy_ = name_without_spaces;
 		else if( token == _default_static_rvalue_reference_return_value_policy_ ) default_static_rvalue_reference_return_value_policy_ = name_without_spaces;

diff --git a/source/config.hpp b/source/config.hpp
@@ -52,7 +52,7 @@ class Config
 	string default_member_rvalue_reference_return_value_policy_ = "pybind11::return_value_policy::automatic";
 	string default_call_guard_ = "";
 	string holder_type_ = "std::shared_ptr";
-	string include_file_ = "pybind11/pybind11.h";
+	string pybind11_include_file_ = "pybind11/pybind11.h";
 	string prefix_for_static_member_functions_ = "";
 
 	std::vector<string> enums_to_bind, enums_to_skip;
@@ -91,7 +91,7 @@ class Config
 	string const &prefix_for_static_member_functions() { return prefix_for_static_member_functions_; }
 
 	string const &holder_type() const { return holder_type_; }
-	string const &include_file() const { return include_file_; }
+	string const &pybind11_include_file() const { return pybind11_include_file_; }
 
 	string prefix;
 

diff --git a/source/context.cpp b/source/context.cpp
@@ -437,7 +437,7 @@ void Context::generate(Config const &config)
 		string shared_declare = "PYBIND11_DECLARE_HOLDER_TYPE(T, "+holder_type+"<T>)";
 		string shared_make_opaque = "PYBIND11_MAKE_OPAQUE("+holder_type+"<void>)";
 
-		string const pybind11_include = "#include <" + Config::get().include_file() + ">";
+		string const pybind11_include = "#include <" + Config::get().pybind11_include_file() + ">";
 		code = generate_include_directives(includes) + fmt::format(module_header, pybind11_include, config.includes_code(), shared_declare, shared_make_opaque) + prefix_code + "void " + function_name + module_function_suffix + "\n{\n" + code + "}\n";
 
 		if( O_single_file ) root_module_file_handle << "// File: " << file_name << '\n' << code << "\n\n";
@@ -463,7 +463,7 @@ void Context::generate(Config const &config)
 		binding_function_calls += "\t" + f + "(M);\n";
 	}
 
-	string const pybind11_include = "#include <" + Config::get().include_file() + ">";
+	string const pybind11_include = "#include <" + Config::get().pybind11_include_file() + ">";
 
 	std::stringstream s;
 	s << fmt::format(main_module_header, pybind11_include, binding_function_decls, config.root_module, namespace_pairs, binding_function_calls);

diff --git a/test/T61.smart_holder.config b/test/T61.smart_holder.config
@@ -1,2 +1,3 @@
 +custom_shared my_shared_ptr
-+smart_holder A
++smart_holder A
++pybind11_include_file pybind11/smart_holder.h