You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@singa.apache.org by wa...@apache.org on 2016/08/17 18:02:35 UTC
[14/51] [abbrv] incubator-singa git commit: Merge PR #228 which
updates cmake files to enable 'make install'.
Merge PR #228 which updates cmake files to enable 'make install'.
Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/dffae6bf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/dffae6bf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/dffae6bf
Branch: refs/heads/master
Commit: dffae6bf33b316a49ed1315e439b8e8948552f1c
Parents: a91bf2a 230230c
Author: Wei Wang <wa...@comp.nus.edu.sg>
Authored: Sun Aug 14 13:59:35 2016 +0800
Committer: Wei Wang <wa...@comp.nus.edu.sg>
Committed: Sun Aug 14 13:59:35 2016 +0800
----------------------------------------------------------------------
CMakeLists.txt | 7 +++++++
cmake/Dependencies.cmake | 7 +++++++
src/CMakeLists.txt | 10 +++++-----
test/CMakeLists.txt | 5 ++---
4 files changed, 21 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/dffae6bf/CMakeLists.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/dffae6bf/cmake/Dependencies.cmake
----------------------------------------------------------------------
diff --cc cmake/Dependencies.cmake
index ceef429,4db8a85..eb729db
--- a/cmake/Dependencies.cmake
+++ b/cmake/Dependencies.cmake
@@@ -5,9 -5,16 +5,16 @@@ SET(SINGA_LINKER_LIBS ""
FIND_PACKAGE( Protobuf REQUIRED )
INCLUDE_DIRECTORIES(SYSTEM ${PROTOBUF_INCLUDE_DIR})
MESSAGE(STATUS "proto libs " ${PROTOBUF_LIBRARIES})
-LIST(APPEND singa_linker_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})
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/dffae6bf/src/CMakeLists.txt
----------------------------------------------------------------------
diff --cc src/CMakeLists.txt
index 66d89dc,f6fa698..4579a67
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -20,10 -19,8 +20,10 @@@ FOREACH(fil ${proto_hdrs}
#COMMAND ${CMAKE_COMMAND} -E echo "copy done"
)
ENDFOREACH()
- LIST(APPEND SINGA_LINKER_LIBS proto)
+ LIST(APPEND SINGA_LINKER_LIBS singa_proto)
+SET(PREVIOUS_LINKER_LIBS ${SINGA_LINKER_LIBS})
+
#FILE(GLOB_RECURSE utils_source ${CMAKE_CURRENT_SOURCE_DIR}/utils/ "*.cc")
AUX_SOURCE_DIRECTORY(utils utils_source)
#message(STATUS "UTILS ${utils_source}")
http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/dffae6bf/test/CMakeLists.txt
----------------------------------------------------------------------
diff --cc test/CMakeLists.txt
index f196928,1c2550b..6fc4d77
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@@ -17,11 -9,9 +17,10 @@@ IF(NOT USE_OPENCL
LIST(REMOVE_ITEM singa_test_source "singa/test_opencl.cc")
ENDIF()
+
ADD_EXECUTABLE(test_singa "gtest/gtest_main.cc" ${singa_test_source})
ADD_DEPENDENCIES(test_singa singa_core singa_utils)
-MESSAGE(STATUS "link libs" ${singa_linker_libs})
+#MESSAGE(STATUS "link libs" ${singa_linker_libs})
TARGET_LINK_LIBRARIES(test_singa gtest singa_core singa_utils singa_model
- singa_io proto protobuf ${SINGA_LINKER_LIBS})
- SET_TARGET_PROPERTIES(test_singa PROPERTIES LINK_FLAGS "${LINK_FLAGS} -pthread ")
-
+ singa_io singa_proto protobuf ${SINGA_LINKER_LIBS})
+ SET_TARGET_PROPERTIES(test_singa PROPERTIES LINK_FLAGS "${LINK_FLAGS} -pthread")