Repository: incubator-singa Updated Branches: refs/heads/dev a91bf2a7e -> dffae6bf3
SINGA-229 Complete install targets Copy all related files into the prefix folders. Add glog detection in cmake/Dependencies.cmake. Please uncomment the codes if you want to test. Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/e39be3e2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/e39be3e2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/e39be3e2 Branch: refs/heads/dev Commit: e39be3e2022d11e5344e9ab3bf61cda55868387d Parents: db5478e Author: xiezl <[email protected]> Authored: Mon Aug 8 10:25:49 2016 +0800 Committer: xiezl <[email protected]> Committed: Mon Aug 8 10:25:49 2016 +0800 ---------------------------------------------------------------------- CMakeLists.txt | 5 +++++ cmake/Dependencies.cmake | 7 +++++++ 2 files changed, 12 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/e39be3e2/CMakeLists.txt ---------------------------------------------------------------------- diff --git a/CMakeLists.txt b/CMakeLists.txt index 23f8ef6..4661c58 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -49,3 +49,8 @@ ENDIF() ADD_SUBDIRECTORY(src) ADD_SUBDIRECTORY(test) ADD_SUBDIRECTORY(examples) + +INSTALL(DIRECTORY include/singa DESTINATION include) +INSTALL(FILES ${CMAKE_BINARY_DIR}/include/singa/singa_config.h DESTINATION include) +INSTALL (DIRECTORY ${CMAKE_BINARY_DIR}/lib DESTINATION ${CMAKE_INSTALL_PREFIX}) +INSTALL (DIRECTORY ${CMAKE_BINARY_DIR}/bin DESTINATION ${CMAKE_INSTALL_PREFIX}) http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/e39be3e2/cmake/Dependencies.cmake ---------------------------------------------------------------------- diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 68d0bfc..4db8a85 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -8,6 +8,13 @@ MESSAGE(STATUS "proto libs " ${PROTOBUF_LIBRARIES}) LIST(APPEND singa_linker_libs ${PROTOBUF_LIBRARIES}) INCLUDE("cmake/Protobuf.cmake") +#FIND_PACKAGE(Glog) +#IF(GLOG_FOUND) +# MESSAGE(STATUS "GLOG FOUND at ${GLOG_INCLUDE_DIR}") +# ADD_DEFINITIONS("-DUSE_GLOG") +# LIST(APPEND SINGA_LINKER_LIBS ${GLOG_LIBRARIES}) +#ENDIF() + IF(USE_LMDB) FIND_PACKAGE(LMDB REQUIRED) INCLUDE_DIRECTORIES(SYSTEM ${LMDB_INCLUDE_DIR})
