Check for YggdrasilRapidJSON cmake config before using the local copy

Import importlib submodules (subpackages?) directly

Author: langmm

CMakeLists.txt

@@ -7,11 +7,6 @@ endif()
 
 include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/ygg_options.cmake)
 
-if (NOT DEFAULT_RAPIDJSON_INCLUDE_DIRS)
-  cmake_path(APPEND CMAKE_CURRENT_SOURCE_DIR rapidjson include
-             OUTPUT_VARIABLE DEFAULT_RAPIDJSON_INCLUDE_DIRS)
-endif()
-
 find_package(
   ${PYTHON_PREFIX} COMPONENTS
   Interpreter Development.Module NumPy REQUIRED)

cmake/ygg_options.cmake

@@ -8,7 +8,7 @@ endif()
 set(YGGDRASIL_IS_SUBPROJECT ON)
 
 if (NOT PROJECT_NAME)
-  cmake_minimum_required(VERSION 3.16)
+  cmake_minimum_required(VERSION 3.5)
 endif()
 set(CMAKE_VERBOSE_MAKEFILE ON)
 if (POLICY CMP0048)
@@ -58,8 +58,13 @@ set(CMAKE_CXX_STANDARD 14)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 if (NOT DEFAULT_RAPIDJSON_INCLUDE_DIRS)
-  cmake_path(APPEND CMAKE_CURRENT_SOURCE_DIR rapidjson include
-             OUTPUT_VARIABLE DEFAULT_RAPIDJSON_INCLUDE_DIRS)
+  find_package(YggdrasilRapidJSON)
+  if(YggdrasilRapidJSON_FOUND)
+    set(DEFAULT_RAPIDJSON_INCLUDE_DIRS YggdrasilRapidJSON_INCLUDE_DIRS)
+  else()
+    cmake_path(APPEND CMAKE_CURRENT_SOURCE_DIR rapidjson include
+               OUTPUT_VARIABLE DEFAULT_RAPIDJSON_INCLUDE_DIRS)
+  endif()
 endif()
 
 option(YGGDRASIL_DONT_MANAGE_PYTHON_GIL "Disable any handling of the Python GIL" OFF)

rapidjson.cpp

@@ -6725,16 +6725,12 @@ normalize(PyObject*, PyObject* args, PyObject* kwargs)
 
 static PyObject*
 get_submodule_spec(PyObject* name, PyObject* path) {
-    PyObject *importlib = NULL, *machinery = NULL, *util = NULL,
+    PyObject *machinery = NULL, *util = NULL,
 	*args = NULL, *kwargs = NULL, *spec = NULL,
 	*ExtensionFileLoader = NULL, *spec_from_loader_func = NULL,
 	*loader = NULL, *ModuleSpecCls = NULL;
-    importlib = PyImport_ImportModule("importlib");
-    if (importlib == NULL)
-	goto cleanup;
-    machinery = PyObject_GetAttrString(importlib, "machinery");
-    util = PyObject_GetAttrString(importlib, "util");
-    Py_CLEAR(importlib);
+    util = PyImport_ImportModule("importlib.util");
+    machinery = PyImport_ImportModule("importlib.machinery");
     if (machinery == NULL || util == NULL)
 	goto cleanup;
 #ifdef MAKE_SUBMODULE_VIA_PYTHON
@@ -6798,7 +6794,6 @@ get_submodule_spec(PyObject* name, PyObject* path) {
     Py_XDECREF(spec_from_loader_func);
     Py_XDECREF(loader);
     Py_XDECREF(ModuleSpecCls);
-    Py_XDECREF(importlib);
     Py_XDECREF(machinery);
     Py_XDECREF(util);
     Py_XDECREF(args);