Skip to content

Commit

Permalink
removing unneeded find-pkgs
Browse files Browse the repository at this point in the history
  • Loading branch information
jbohren committed Mar 7, 2013
1 parent b92909a commit e5c54a1
Showing 1 changed file with 7 additions and 16 deletions.
23 changes: 7 additions & 16 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,11 @@ cmake_minimum_required(VERSION 2.8.3)

# 3rd-party Dependencies
find_package(PkgConfig)
pkg_check_modules(LIBXML2 REQUIRED libxml-2.0)
pkg_check_modules(GSTREAMER REQUIRED gstreamer-0.10)
pkg_check_modules(GLIB REQUIRED glib-2.0)
pkg_check_modules(OPENCV2 REQUIRED opencv2)


if(USE_ROSBUILD)
message("USING ROSBUILD")
# Use rosbuild
include($ENV{ROS_ROOT}/core/rosbuild/rosbuild.cmake)

Expand All @@ -17,14 +15,11 @@ if(USE_ROSBUILD)
set(EXECUTABLE_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/bin)
set(LIBRARY_OUTPUT_PATH ${PROJECT_SOURCE_DIR}/lib)

include_directories(${GLIB_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS})
include_directories(${GSTREAMER_INCLUDE_DIRS})
rosbuild_add_executable(gscam src/gscam.cpp)
target_link_libraries(gscam
gstreamer-0.10 gstbase-0.10
gobject-2.0 gmodule-2.0 gthread-2.0
rt xml2 glib-2.0 gstapp-0.10
pthread)
target_link_libraries(gscam ${GSTREAMER_LIBRARIES})
else()
message("USING CATKIN")
# Use Catkin
project(gscam)

Expand All @@ -38,21 +33,17 @@ else()
DEPENDS opencv2
)

include_directories(${catkin_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LIBXML2_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS})
include_directories(${catkin_INCLUDE_DIRS} ${GSTREAMER_INCLUDE_DIRS})
add_executable(gscam src/gscam.cpp)
target_link_libraries(gscam
${catkin_LIBRARIES}
gstreamer-0.10 gstbase-0.10
gobject-2.0 gmodule-2.0 gthread-2.0
rt xml2 glib-2.0 gstapp-0.10
pthread)
${GSTREAMER_LIBRARIES})

install(TARGETS gscam
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)

)

endif()

0 comments on commit e5c54a1

Please sign in to comment.