Skip to content

Commit

Permalink
Move duckdb compile before re2 and fmt (#7722)
Browse files Browse the repository at this point in the history
Summary:
After DuckDB upgrade (PR #6725) we see build errors:

```
/opt/gluten/ep/build-velox/build/velox_ep/_build/release/_deps/duckdb-src/src/planner/binder/expression/bind_star_expression.cpp:123:4: error: 'duckdb_re2' has not been declared
  123 |    duckdb_re2::RE2 regex(regex_str);
      |    ^~~~~~~~~~
```

If we compile re2 and fmt before DuckDB, there will cause dependency conflict.

A fix is to compile DuckDB before re2 and fmt.

Pull Request resolved: #7722

Reviewed By: pedroerp

Differential Revision: D51605184

Pulled By: mbasmanova

fbshipit-source-id: 54acb0a0f672abe710f6f398fa465ec46d38573c
  • Loading branch information
JkSelf authored and facebook-github-bot committed Nov 28, 2023
1 parent 9f5c96b commit 013ec4b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -421,6 +421,11 @@ else()
endif()
resolve_dependency(glog)

if(${VELOX_ENABLE_DUCKDB})
set_source(DuckDB)
resolve_dependency(DuckDB)
endif()

set_source(fmt)
resolve_dependency(fmt)

Expand Down Expand Up @@ -528,11 +533,6 @@ endif()
find_package(BISON 3.0.4 REQUIRED)
find_package(FLEX 2.5.13 REQUIRED)

if(${VELOX_ENABLE_DUCKDB})
set_source(DuckDB)
resolve_dependency(DuckDB)
endif()

include_directories(SYSTEM velox)
include_directories(SYSTEM velox/external)

Expand Down

0 comments on commit 013ec4b

Please sign in to comment.