This commit is contained in:
Philipp Moritz committed 2017-07-19 10:06:33 -07:00
1 parent 4ae1a2765d
commit 348f9bf645
3 files changed
+7 -7

No files matched your search

+4 -2
View File
@@ -70,8 +70,6 @@ endif()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
set_source_files_properties(extension.cc PROPERTIES COMPILE_FLAGS -Wno-strict-aliasing)
set(PLASMA_SRCS
client.cc
common.cc
@@ -101,8 +99,12 @@ target_link_libraries(plasma_store plasma_static)
# Headers: top level
install(FILES
common.h
common_generated.h
client.h
events.h
plasma.h
plasma_generated.h
protocol.h
DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/plasma")
# pkg-config support
+2 -2
View File
@@ -70,8 +70,8 @@ struct ClientMmapTableEntry {
};
struct ObjectInUseEntry;
class ObjectRequest;
class PlasmaObject;
struct ObjectRequest;
struct PlasmaObject;
class ARROW_EXPORT PlasmaClient {
public:
+1 -3
View File
@@ -65,7 +65,7 @@ if (PLASMA_INCLUDE_DIR AND PLASMA_LIBS)
set(PLASMA_FOUND TRUE)
set(PLASMA_LIB_NAME plasma)
set(PLASMA_STATIC_LIB ${PLASMA_PYTHON_LIB_PATH}/lib${PLASMA_LIB_NAME}.a)
set(PLASMA_STATIC_LIB ${PLASMA_LIBS}/lib${PLASMA_LIB_NAME}.a)
set(PLASMA_SHARED_LIB ${PLASMA_LIBS}/lib${PLASMA_LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX})
endif()
@@ -92,6 +92,4 @@ mark_as_advanced(
PLASMA_INCLUDE_DIR
PLASMA_STATIC_LIB
PLASMA_SHARED_LIB
PLASMA_PYTHON_STATIC_LIB
PLASMA_PYTHON_SHARED_LIB
)