Skip to content

Commit

Permalink
Use a DYNAMIC that has hopscotch-map as a submodule
Browse files Browse the repository at this point in the history
Fixes #3337
  • Loading branch information
adamnovak committed Jul 12, 2021
1 parent beea35e commit 2fa3616
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ $(INC_DIR)/lru_cache.h: $(DEP_DIR)/lru_cache/*.h $(DEP_DIR)/lru_cache/*.cc
$(INC_DIR)/dynamic/dynamic.hpp: $(DYNAMIC_DIR)/include/dynamic/*.hpp $(DYNAMIC_DIR)/include/dynamic/*/*.hpp
rm -Rf $(INC_DIR)/dynamic.hpp $(INC_DIR)/dynamic
# annoyingly doesn't have an install option on the cmake, so we manually move their external dependency headers
cd $(CWD)/$(DYNAMIC_DIR) && rm -Rf build && mkdir -p build && cd build && export CXXFLAGS="$(CPPFLAGS) $(CXXFLAGS)" && cmake -DCMAKE_VERBOSE_MAKEFILE=ON .. && make && cp -r hopscotch_map-prefix/src/hopscotch_map/include/* $(CWD)/$(INC_DIR)/
cd $(CWD)/$(DYNAMIC_DIR) && rm -Rf build && mkdir -p build && cd build && export CXXFLAGS="$(CPPFLAGS) $(CXXFLAGS)" && cmake -DCMAKE_VERBOSE_MAKEFILE=ON .. && make && cp -r $(CWD)/$(DYNAMIC_DIR)/deps/hopscotch_map/include/* $(CWD)/$(INC_DIR)/
# Do the copy of the main file last so we can tell if this recipe failed and redo it.
# Otherwise we get dynamic.hpp without its deps
mkdir -p $(INC_DIR)/dynamic && cp -r $(CWD)/$(DYNAMIC_DIR)/include/dynamic/* $(INC_DIR)/dynamic/
Expand Down
2 changes: 1 addition & 1 deletion deps/DYNAMIC

0 comments on commit 2fa3616

Please sign in to comment.