diff --git a/.gitmodules b/.gitmodules index 23ecc8b..64905f2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -14,9 +14,6 @@ path = extern/pybind11 url = ../../pybind/pybind11 branch = stable -[submodule "submodules/redis-plus-plus"] - path = submodules/redis-plus-plus - url = https://github.com/sewenew/redis-plus-plus.git [submodule "submodules/BTree"] path = submodules/BTree url = https://github.com/frozenca/BTree.git diff --git a/SpiceQL/src/inventoryimpl.cpp b/SpiceQL/src/inventoryimpl.cpp index 481651c..c41c0b6 100644 --- a/SpiceQL/src/inventoryimpl.cpp +++ b/SpiceQL/src/inventoryimpl.cpp @@ -1,6 +1,8 @@ #include #include +// we need to include this to overwrite and other std::fs imports +#include #include #include #include diff --git a/bindings/python/CMakeLists.txt b/bindings/python/CMakeLists.txt index 8ff73ea..bcf0cb0 100644 --- a/bindings/python/CMakeLists.txt +++ b/bindings/python/CMakeLists.txt @@ -45,4 +45,4 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/__init__.py COPYONLY) # Setup to run setup tools on install -install(CODE "execute_process(COMMAND python -m pip install -e . WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") \ No newline at end of file +install(CODE "execute_process(COMMAND pip install . WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})") \ No newline at end of file diff --git a/submodules/redis-plus-plus b/submodules/redis-plus-plus deleted file mode 160000 index afa0e3f..0000000 --- a/submodules/redis-plus-plus +++ /dev/null @@ -1 +0,0 @@ -Subproject commit afa0e3fcf131f91836bb060ead12b9171ed40a64