diff --git a/CMakeLists.txt b/CMakeLists.txt index 52840eadb..f8341a561 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -475,7 +475,7 @@ endif(NOT GFlags_FOUND) ################################################################################ -# glog - http://code.google.com/p/google-glog/ +# glog - https://github.com/google/glog ################################################################################ if(NOT ${ENABLE_OWN_GLOG}) find_package(GLOG) @@ -483,7 +483,7 @@ if(NOT ${ENABLE_OWN_GLOG}) set(GLOG_FOUND ON) endif(GLOG_INCLUDE_DIRS) endif(NOT ${ENABLE_OWN_GLOG}) -set(glog_RELEASE 0.3.3) +set(glog_RELEASE 0.3.4) if (NOT GLOG_FOUND OR ${LOCAL_GFLAGS}) message (STATUS " glog library has not been found") if(NOT GFlags_FOUND) @@ -495,8 +495,6 @@ if (NOT GLOG_FOUND OR ${LOCAL_GFLAGS}) add_library(gflags-${gflags_RELEASE} UNKNOWN IMPORTED) set_property(TARGET gflags-${gflags_RELEASE} PROPERTY IMPORTED_LOCATION "${GFlags_LIBS}") endif(NOT ${LOCAL_GFLAGS}) - set(glog_RELEASE 0.3.3) - set(glog_MD5 "a6fd2c22f8996846e34c763422717c18") if(${LOCAL_GFLAGS}) set(TARGET_GFLAGS ${gflags}) @@ -558,39 +556,23 @@ ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${glog_RELEASE}/configure") endif(${LOCAL_GFLAGS}) set(GLOG_CONFIGURE ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE}/configure_with_gflags) - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - ExternalProject_Add( - glog-${glog_RELEASE} - DEPENDS ${TARGET_GFLAGS} - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE} - SVN_REPOSITORY http://google-glog.googlecode.com/svn/trunk - SVN_REVISION -r "142" - DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/download/glog-${glog_RELEASE} - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${glog_RELEASE} - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE} - CONFIGURE_COMMAND ${GLOG_CONFIGURE} --prefix= - BUILD_COMMAND make - UPDATE_COMMAND "" - PATCH_COMMAND "" - INSTALL_COMMAND "" - ) - else("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") - ExternalProject_Add( - glog-${glog_RELEASE} - DEPENDS ${TARGET_GFLAGS} - PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE} - URL http://google-glog.googlecode.com/files/glog-${glog_RELEASE}.tar.gz - DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/download/glog-${glog_RELEASE} - URL_MD5 ${glog_MD5} - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${glog_RELEASE} - BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE} - CONFIGURE_COMMAND ${GLOG_CONFIGURE} --prefix= - BUILD_COMMAND make - UPDATE_COMMAND "" - PATCH_COMMAND "" - INSTALL_COMMAND "" - ) - endif("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang") + + ExternalProject_Add( + glog-${glog_RELEASE} + DEPENDS ${TARGET_GFLAGS} + PREFIX ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE} + GIT_REPOSITORY https://github.com/google/glog/ + GIT_TAG v${glog_RELEASE} + DOWNLOAD_DIR ${CMAKE_CURRENT_BINARY_DIR}/download/glog-${glog_RELEASE} + SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${glog_RELEASE} + BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/glog-${glog_RELEASE} + CONFIGURE_COMMAND ${GLOG_CONFIGURE} --prefix= + BUILD_COMMAND make + UPDATE_COMMAND "" + PATCH_COMMAND "" + INSTALL_COMMAND "" + ) + # Set up variables set(GLOG_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glog/glog-${glog_RELEASE}/src/ diff --git a/README.md b/README.md index 4bd84c793..48409191b 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ The full stop separated from ```cmake``` by a space is important. [CMake](http:/ -#### Install [Gflags](https://gflags.github.io/gflags/ "Gflags' Homepage"), a commandline flags processing module for C++: +#### Install [Gflags](https://github.com/gflags/gflags "Gflags' Homepage"), a commandline flags processing module for C++: ~~~~~~ $ wget https://github.com/gflags/gflags/archive/v2.1.2.tar.gz @@ -120,12 +120,12 @@ $ sudo ldconfig -#### Install [Glog](http://code.google.com/p/google-glog/ "Glog's Homepage"), a library that implements application-level logging: +#### Install [Glog](https://github.com/google/glog "Glog's Homepage"), a library that implements application-level logging: ~~~~~~ -$ wget http://google-glog.googlecode.com/files/glog-0.3.3.tar.gz -$ tar xvfz glog-0.3.3.tar.gz -$ cd glog-0.3.3 +$ wget https://github.com/google/glog/archive/v0.3.4.tar.gz +$ tar xvfz v0.3.4.tar.gz +$ cd glog-0.3.4 $ ./configure $ make $ sudo make install