Repository: incubator-singa Updated Branches: refs/heads/master 0695daa66 -> 0d4b97e0b
SINGA-306 - Write the definition of USE_GLOG into singa_config.h add USE_GLOG into singa_config.h during building let travis wait for longer time to install depdent libs Project: http://git-wip-us.apache.org/repos/asf/incubator-singa/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-singa/commit/2247f111 Tree: http://git-wip-us.apache.org/repos/asf/incubator-singa/tree/2247f111 Diff: http://git-wip-us.apache.org/repos/asf/incubator-singa/diff/2247f111 Branch: refs/heads/master Commit: 2247f11144c2c1edf8a3180efc3c82b1dda6f690 Parents: a6e7690 Author: Wei Wang <[email protected]> Authored: Tue Mar 14 23:03:34 2017 +0800 Committer: wangwei <[email protected]> Committed: Wed Mar 15 10:00:07 2017 +0800 ---------------------------------------------------------------------- .travis.yml | 2 +- cmake/Dependencies.cmake | 1 + cmake/Templates/singa_config.h.in | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2247f111/.travis.yml ---------------------------------------------------------------------- diff --git a/.travis.yml b/.travis.yml index 3c1fab4..eb9ff69 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,7 +37,7 @@ matrix: # - protobuf-compiler install: - - bash -ex tool/travis/depends.sh + - travis_wait bash -ex tool/travis/depends.sh script: - bash -ex tool/travis/build.sh http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2247f111/cmake/Dependencies.cmake ---------------------------------------------------------------------- diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake index 708628b..a3cd4ff 100644 --- a/cmake/Dependencies.cmake +++ b/cmake/Dependencies.cmake @@ -69,6 +69,7 @@ FIND_PACKAGE(Glog) IF(GLOG_FOUND) #MESSAGE(STATUS "GLOG FOUND at ${GLOG_INCLUDE_DIR}") ADD_DEFINITIONS("-DUSE_GLOG") + SET(USE_GLOG TRUE) LIST(APPEND SINGA_LINKER_LIBS ${GLOG_LIBRARIES}) INCLUDE_DIRECTORIES(${GLOG_INCLUDE_DIR}) ENDIF() http://git-wip-us.apache.org/repos/asf/incubator-singa/blob/2247f111/cmake/Templates/singa_config.h.in ---------------------------------------------------------------------- diff --git a/cmake/Templates/singa_config.h.in b/cmake/Templates/singa_config.h.in index 24ee12d..e35230c 100644 --- a/cmake/Templates/singa_config.h.in +++ b/cmake/Templates/singa_config.h.in @@ -32,6 +32,8 @@ #cmakedefine USE_OPENCL +#cmakedefine USE_GLOG + #cmakedefine ENABLE_DIST // lmdb
