Skip to content
This repository was archived by the owner on May 9, 2024. It is now read-only.

Enable folly #293

Merged
merged 8 commits into from
Mar 21, 2023
+79 −107
Merged

Enable folly #293

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
07b9210
Enable folly by default
kurapov-peter Feb 22, 2023
0f5b6d6
Propagate ENABLE_FOLLY definition to python code
alexbaden Mar 18, 2023
902c559
Use default memory settings for smoke test
alexbaden Mar 19, 2023
889f49b
[tmp] disable large buffers tests
alexbaden Mar 20, 2023
67b86ee
Disable hdk sanity_test job and rename smoke -> sanity
alexbaden Mar 20, 2023
d28c8f3
Fixup folly linking
alexbaden Mar 20, 2023
3b215c5
Conditionally skip large buffer tests on small memory actions instances
alexbaden Mar 20, 2023
7a7b2be
Use modern cmake targets for folly
alexbaden Mar 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Use modern cmake targets for folly
@alexbaden
alexbaden committed Mar 20, 2023
commit 7a7b2be062c6f00c9625089ab47c2a7e300e2dca
4 changes: 2 additions & 2 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -94,9 +94,9 @@ if(ENABLE_FOLLY)
if(NOT Folly_FOUND)
set(ENABLE_FOLLY OFF CACHE BOOL "Use Folly" FORCE)
else()
include_directories(${Folly_INCLUDE_DIRS})
set(FOLLY_LIBRARIES "")
add_definitions("-DHAVE_FOLLY")
list(APPEND Folly_LIBRARIES ${Glog_LIBRARIES})
list(APPEND Folly_LIBRARIES Folly::folly ${Glog_LIBRARIES})
# TODO: use Folly::folly_deps?
if(MSVC)
find_package(Libevent COMPONENTS core REQUIRED)
89 changes: 0 additions & 89 deletions cmake_modules/FindFolly.cmake
View file

This file was deleted.

4 changes: 2 additions & 2 deletions omniscidb/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -313,9 +313,9 @@ if(ENABLE_FOLLY)
if(NOT Folly_FOUND)
set(ENABLE_FOLLY OFF CACHE BOOL "Use Folly" FORCE)
else()
include_directories(${Folly_INCLUDE_DIRS})
set(FOLLY_LIBRARIES "")
add_definitions("-DHAVE_FOLLY")
list(APPEND Folly_LIBRARIES ${Glog_LIBRARIES})
list(APPEND Folly_LIBRARIES Folly::folly ${Glog_LIBRARIES})
# TODO: use Folly::folly_deps?
if(MSVC)
find_package(Libevent COMPONENTS core REQUIRED)