Minor fixes.

Author: adalisk-emikhaylov

include/pybind11/detail/non_limited_api.h

@@ -184,10 +184,10 @@ PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
 #define PYBIND11_NONLIMITEDAPI_LIB_SUFFIX_FOR_MODULE nullptr
 #endif
 
-#ifdef PYBIND11_NONLIMITEDAPI_LIB_PATH_RELATIVE_TO_PARENT_LIB
-#define PYBIND11_NONLIMITEDAPI_LIB_PATH_RELATIVE_TO_PARENT_LIB_WITH_SLASH / PYBIND11_NONLIMITEDAPI_LIB_PATH_RELATIVE_TO_PARENT_LIB
+#ifdef PYBIND11_NONLIMITEDAPI_SHIM_PATH_RELATIVE_TO_LIBRARY_DIR
+#define PYBIND11_NONLIMITEDAPI_SHIM_PATH_RELATIVE_TO_LIBRARY_DIR_WITH_SLASH / PYBIND11_NONLIMITEDAPI_SHIM_PATH_RELATIVE_TO_LIBRARY_DIR
 #else
-#define PYBIND11_NONLIMITEDAPI_LIB_PATH_RELATIVE_TO_PARENT_LIB_WITH_SLASH
+#define PYBIND11_NONLIMITEDAPI_SHIM_PATH_RELATIVE_TO_LIBRARY_DIR_WITH_SLASH
 #endif
 
 #ifdef _WIN32
@@ -209,15 +209,15 @@ PYBIND11_NAMESPACE_END(PYBIND11_NAMESPACE)
         else if (size == MAX_PATH) \
             throw std::runtime_error( "pybind11 non-limited-api: The self library path is too long." ); \
         \
-        return std::filesystem::path(path).parent_path() PYBIND11_NONLIMITEDAPI_LIB_PATH_RELATIVE_TO_PARENT_LIB_WITH_SLASH; \
+        return std::filesystem::path(path).parent_path() PYBIND11_NONLIMITEDAPI_SHIM_PATH_RELATIVE_TO_LIBRARY_DIR_WITH_SLASH; \
     }()
 #else
 #define PYBIND11_NONLIMITEDAPI_GET_SHARED_LIBRARY_DIR(module_) \
     []{ \
         Dl_info info; \
         if (!dladdr((void*)PYBIND11_CONCAT(PyInit_, module_), &info)) \
             throw std::runtime_error( "pybind11 non-limited-api: Failed to get the self library path." ); \
-        return std::filesystem::path(info.dli_fname).parent_path() PYBIND11_NONLIMITEDAPI_LIB_PATH_RELATIVE_TO_PARENT_LIB_WITH_SLASH; \
+        return std::filesystem::path(info.dli_fname).parent_path() PYBIND11_NONLIMITEDAPI_SHIM_PATH_RELATIVE_TO_LIBRARY_DIR_WITH_SLASH; \
     }()
 #endif
 

source/non_limited_api/CMakeLists.txt

@@ -50,7 +50,7 @@ else()
     target_link_options(${PYBIND11_NONLIMITEDAPI_LIBNAME} PRIVATE -undefined dynamic_lookup)
   endif()
 
-  if (NOT(${PYBIND11_NONLIMITEDAPI_LIBRARY_OUTPUT_DIR} STREQUAL ""))
+  if (NOT("${PYBIND11_NONLIMITEDAPI_LIBRARY_OUTPUT_DIR}" STREQUAL ""))
     set_target_properties(${PYBIND11_NONLIMITEDAPI_LIBNAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PYBIND11_NONLIMITEDAPI_LIBRARY_OUTPUT_DIR})
   endif()