Skip to content

Commit

Permalink
making the package compilable in a catkin workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
Stephan Wirth committed Apr 29, 2013
1 parent 3e4bb1b commit 130a5e3
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 8 deletions.
14 changes: 13 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
cmake_minimum_required(VERSION 2.8)

PROJECT(open_karto)

# Export flags for dependent catkin packages
option(USE_CATKIN "Use catkin if found to build the package" ON)
if (USE_CATKIN)
find_package(catkin)
if(catkin_FOUND)
message(STATUS "Using catkin.")
catkin_package(INCLUDE_DIRS source/OpenKarto/
LIBRARIES OpenKarto)
endif(catkin_FOUND)
endif(USE_CATKIN)

set(KARTO_LIB_TYPE SHARED)
add_subdirectory(source)

install(FILES package.xml DESTINATION share/open_karto)
5 changes: 1 addition & 4 deletions package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@
<license>LGPLv3</license>

<run_depend>catkin</run_depend>
<buildtool_depend>cmake</buildtool_depend>
<buildtool_depend>catkin</buildtool_depend>

<export>
<build_type>cmake</build_type>
</export>
</package>
4 changes: 1 addition & 3 deletions source/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
cmake_minimum_required(VERSION 2.8)

# set library name
SET(LIB_NAME OpenKarto)

PROJECT(${LIB_NAME})

if(WIN32)
# turn off various warnings
foreach(warning 4251)
Expand Down

0 comments on commit 130a5e3

Please sign in to comment.