Skip to content

Commit

Permalink
fix pslite miss in mxnet
Browse files Browse the repository at this point in the history
  • Loading branch information
yajiedesign committed Mar 28, 2017
1 parent 6856021 commit 497bf77
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
9 changes: 7 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,14 @@ list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/Modules)

include(ExternalProject)
set(pslite_LINKER_LIBS_L "" )
set(pslite_LINKER_LIBS_L_RELEASE "" )
set(pslite_LINKER_LIBS_L_DEBUG "" )
set(pslite_INCLUDE_DIR_L "" )

# ---[ zmq
include("cmake/External/zmq.cmake")
include_directories(pslite ${ZMQ_INCLUDE_DIRS})
list(APPEND pslite_LINKER_LIBS_L ${ZMQ_LIBRARIES})

# ---[ Google-protobuf
include(cmake/ProtoBuf.cmake)

Expand Down Expand Up @@ -52,9 +53,13 @@ list(APPEND SOURCE ${proto_srcs})
add_library(pslite ${SOURCE})

target_link_libraries(pslite ${pslite_LINKER_LIBS})
list(APPEND pslite_LINKER_LIBS_L ${PROTOBUF_LIBRARIES})

list(APPEND pslite_LINKER_LIBS_L_RELEASE ${Protobuf_LIBRARY})
list(APPEND pslite_LINKER_LIBS_L_DEBUG ${Protobuf_LIBRARY_DEBUG})
list(APPEND pslite_INCLUDE_DIR_L "${PROJECT_SOURCE_DIR}/include")
list(APPEND pslite_INCLUDE_DIR_L ${PROTOBUF_INCLUDE_DIR})

set(pslite_LINKER_LIBS ${pslite_LINKER_LIBS_L} PARENT_SCOPE)
set(pslite_LINKER_LIBS_RELEASE ${pslite_LINKER_LIBS_L_RELEASE} PARENT_SCOPE)
set(pslite_LINKER_LIBS_DEBUG ${pslite_LINKER_LIBS_L_DEBUG} PARENT_SCOPE)
set(pslite_INCLUDE_DIR ${pslite_INCLUDE_DIR_L} PARENT_SCOPE)
2 changes: 1 addition & 1 deletion cmake/ProtoBuf.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

find_package( Protobuf REQUIRED )
include_directories(SYSTEM ${PROTOBUF_INCLUDE_DIR})
list(APPEND pslite_LINKER_LIBS ${PROTOBUF_LIBRARIES})


# As of Ubuntu 14.04 protoc is no longer a part of libprotobuf-dev package
# and should be installed separately as in: sudo apt-get install protobuf-compiler
Expand Down

0 comments on commit 497bf77

Please sign in to comment.