Merge pull request #28 from ethz-asl/feature/install

support catkin install
ethz-asl · Jul 16, 2018 · dcb4559 · dcb4559
2 parents de911f7 + a952c89
commit dcb4559
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,7 @@
 *.exe
 *.out
 *.app
+
+# Bloom.
+debian
+obj*
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -20,11 +20,11 @@ ExternalProject_Add(glog_src
   INSTALL_COMMAND cd ../glog_src/ && make install -j 8
 )
 
-cs_add_library(${PROJECT_NAME} src/dependency_tracker.cc)
-add_dependencies(${PROJECT_NAME} glog_src)
-target_link_libraries(${PROJECT_NAME} ${CATKIN_DEVEL_PREFIX}/lib/libglog${CMAKE_SHARED_LIBRARY_SUFFIX})
-
-cs_install()
-
+install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/include/glog
+        DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
+        FILES_MATCHING PATTERN "*.h")
+install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/lib/
+        DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
+        FILES_MATCHING PATTERN "libglog*")
 cs_export(INCLUDE_DIRS ${CATKIN_DEVEL_PREFIX}/include
-  CFG_EXTRAS glog-extras.cmake)
+          LIBRARIES glog)
diff --git a/cmake/glog-extras.cmake.in b/cmake/glog-extras.cmake.in
diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>glog_catkin</name>
-  <version>0.0.0</version>
+  <version>0.3.5</version>
   <description>glog_catkin</description>
   <maintainer email="[email protected]">Simon Lynen</maintainer>
 

diff --git a/src/dependency_tracker.cc b/src/dependency_tracker.cc
-Original file line number
+Diff line change
@@ Expand Up / @@ -19,3 +19,7 @@ @@
     *.exe
     *.out
     *.app
+    # Bloom.
+    debian
+    obj*