Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
)
Expand Down
4 changes: 4 additions & 0 deletions get-newest-config-guess.sh
Original file line number Diff line number Diff line change
@@ -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