diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ef0d59..bc2ac90 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,9 +13,9 @@ ExternalProject_Add(glog_src URL https://github.com/google/glog/archive/v${VERSION}.zip UPDATE_COMMAND "" PATCH_COMMAND patch -p0 < ${CMAKE_SOURCE_DIR}/fix-unused-typedef-warning.patch - CONFIGURE_COMMAND cd ../glog_src/ && ./configure --with-pic - --with-gflags=${gflags_catkin_PREFIX} - --prefix=${CATKIN_DEVEL_PREFIX} + CONFIGURE_COMMAND cd ../glog_src/ && + eval ${CMAKE_SOURCE_DIR}/get-newest-config-guess.sh && + ./configure --with-pic --with-gflags=${gflags_catkin_PREFIX} --prefix=${CATKIN_DEVEL_PREFIX} BUILD_COMMAND cd ../glog_src/ && make -j 8 INSTALL_COMMAND cd ../glog_src/ && make install -j 8 ) diff --git a/get-newest-config-guess.sh b/get-newest-config-guess.sh new file mode 100755 index 0000000..43f2e64 --- /dev/null +++ b/get-newest-config-guess.sh @@ -0,0 +1,4 @@ +#!/bin/bash +wget -nv -O config.guess 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD' && +wget -nv -O config.sub 'http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD' && +chmod +x config.guess config.sub