Introduced catkin simple again

ethz-asl · Jun 29, 2018 · e2c74a8 · e2c74a8
1 parent 83a74eb
commit e2c74a8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 7 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,7 +1,8 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(glog_catkin)
 
-find_package(catkin REQUIRED COMPONENTS gflags_catkin)
+find_package(catkin_simple REQUIRED)
+catkin_simple()
 
 include(ExternalProject)
 
@@ -19,12 +20,11 @@ ExternalProject_Add(glog_src
   INSTALL_COMMAND cd ../glog_src/ && make install -j 8
 )
 
-include_directories(include ${CATKIN_DEVEL_PREFIX}/include ${catkin_INCLUDE_DIRS})
-catkin_package(
-  INCLUDE_DIRS ${CATKIN_DEVEL_PREFIX}/include ${catkin_INCLUDE_DIRS}
-  LIBRARIES glog)
-install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/include/glog DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
+install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/include/glog
+        DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}
         FILES_MATCHING PATTERN "*.h")
 install(DIRECTORY ${CATKIN_DEVEL_PREFIX}/lib/
-        DESTINATION ${CATKIN_GLOBAL_LIB_DESTINATION}
+        DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
         FILES_MATCHING PATTERN "libglog*")
+cs_export(INCLUDE_DIRS ${CATKIN_DEVEL_PREFIX}/include
+          LIBRARIES glog)
diff --git a/package.xml b/package.xml
@@ -7,6 +7,7 @@
   <license>See package</license>
 
   <buildtool_depend>catkin</buildtool_depend>
+  <buildtool_depend>catkin_simple</buildtool_depend>
 
   <depend>gflags_catkin</depend>
 </package>