Skip to content

Commit

Permalink
Merge pull request #16 from ethz-asl/fix/osx_dont_rebuild
Browse files Browse the repository at this point in the history
No longer rebuild every single time on OSX
  • Loading branch information
helenol authored Feb 27, 2017
2 parents eb23bbb + 751c7c0 commit 942b8df
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@ file(MAKE_DIRECTORY ${CATKIN_DEVEL_PREFIX}/include)

set(VERSION 0.3.4)
ExternalProject_Add(glog_src
DOWNLOAD_COMMAND wget --retry-connrefused --waitretry=1 --timeout=12 --tries 10 https://github.com/google/glog/archive/v${VERSION}.zip
UPDATE_COMMAND unzip -d . -o ../v${VERSION}.zip
CONFIGURE_COMMAND cd ../glog_src/glog-${VERSION} && ./configure --with-pic
URL https://github.com/google/glog/archive/v${VERSION}.zip
UPDATE_COMMAND ""
CONFIGURE_COMMAND cd ../glog_src/ && ./configure --with-pic
--with-gflags=${gflags_catkin_PREFIX}
--prefix=${CATKIN_DEVEL_PREFIX}
BUILD_COMMAND cd ../glog_src/glog-${VERSION} && make -j 8
INSTALL_COMMAND cd ../glog_src/glog-${VERSION} && make install -j 8
BUILD_COMMAND cd ../glog_src/ && make -j 8
INSTALL_COMMAND cd ../glog_src/ && make install -j 8
)

cs_add_library(${PROJECT_NAME} src/dependency_tracker.cc)
Expand Down
3 changes: 1 addition & 2 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

<buildtool_depend>catkin</buildtool_depend>
<buildtool_depend>catkin_simple</buildtool_depend>

<build_depend>gflags_catkin</build_depend>
<build_depend>unzip</build_depend>
</package>

0 comments on commit 942b8df

Please sign in to comment.