Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade Arrow to 0.15.0, link python arrow from prebuilt library #768

Merged
merged 5 commits into from
Oct 20, 2019
Merged

Upgrade Arrow to 0.15.0, link python arrow from prebuilt library #768

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
895fc3f
upgrade arrow to 0.15, link python arrow from pyarrow
sc1f Oct 14, 2019
c58e322
pin python to 0.15, fix config.h
sc1f Oct 15, 2019
055ce82
use system shared library prefix
sc1f Oct 15, 2019
35c9c08
remove boost filesystem dep for python
sc1f Oct 17, 2019
a520b17
build minimal arrow from source for linux - finish upgrade to 0.15
sc1f Oct 18, 2019
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
Next Next commit
remove boost filesystem dep for python
  • Loading branch information
@sc1f
sc1f committed Oct 18, 2019
commit 35c9c08eb015896a5cdc7b74167043ca56be26d7
25 changes: 18 additions & 7 deletions cpp/perspective/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,13 +231,16 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
set(ASYNC_MODE_FLAGS "")
set(ASMJS_MODE_FLAGS "")

find_package(Boost COMPONENTS filesystem)
if(NOT Boost_FOUND)
message("${Red}Boost could not be located${ColorReset}")
else()
message("${Cyan}Found boost in ${Boost_INCLUDE_DIRS} ${Boost_LIBRARY_DIRS} ${ColorReset}")
if(PSP_CPP_BUILD)
# filesystem not required for Python, as we link to prebuilt arrow shared library
find_package(Boost COMPONENTS filesystem)
if(NOT Boost_FOUND)
message("${Red}Boost could not be located${ColorReset}")
else()
message("${Cyan}Found boost in ${Boost_INCLUDE_DIRS} ${Boost_LIBRARY_DIRS} ${ColorReset}")
endif()
include_directories( ${Boost_INCLUDE_DIRS} )
endif()
include_directories( ${Boost_INCLUDE_DIRS} )

find_package(TBB)
if(NOT TBB_FOUND)
Expand Down Expand Up @@ -266,6 +269,15 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
find_package( PythonLibs 3.7 REQUIRED )
include_directories( ${PYTHON_INCLUDE_DIRS} )


find_package(Boost)
if(NOT Boost_FOUND)
message("${Red}Boost could not be located${ColorReset}")
else()
message("${Cyan}Found boost in ${Boost_INCLUDE_DIRS} ${Boost_LIBRARY_DIRS} ${ColorReset}")
endif()
include_directories( ${Boost_INCLUDE_DIRS} )

find_package(pybind11)
if(NOT pybind11_FOUND)
message("${Red}PyBind11 could not be located${ColorReset}")
Expand Down Expand Up @@ -451,7 +463,6 @@ elseif(PSP_CPP_BUILD OR PSP_PYTHON_BUILD)
target_compile_definitions(psp PRIVATE PSP_ENABLE_PYTHON=1)

# Link against libarrow 0.15.0 in pyarrow directory
target_link_libraries(psp ${Boost_FILESYSTEM_LIBRARY})
target_link_libraries(psp ${PYTHON_PYARROW_SHARED_LIBRARY})

target_link_libraries(psp ${PYTHON_LIBRARIES})
Expand Down