This commit is contained in:
2015-05-20 01:21:56 +02:00
parent 7c58159c0e
commit 0d62915a11
17 changed files with 819 additions and 13 deletions
+15 -3
View File
@@ -76,8 +76,8 @@ find_package(catkin REQUIRED)
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES hos_libhttpserver
INCLUDE_DIRS include/${PROJECT_NAME}/
LIBRARIES gcrypt microhttpd httpserver
# CATKIN_DEPENDS other_catkin_pkg
# DEPENDS system_lib
)
@@ -96,6 +96,10 @@ ExternalProject_Add( libgcrypt_project
INSTALL_COMMAND make install
)
add_library( gcrypt SHARED IMPORTED )
set_property( TARGET gcrypt PROPERTY IMPORTED_LOCATION "${CATKIN_DEVEL_PREFIX}/lib/libgcrypt.so")
add_dependencies( gcrypt libgcrypt_project )
ExternalProject_Add( libmicrohttpd_project
DEPENDS libgcrypt_project
@@ -105,8 +109,12 @@ ExternalProject_Add( libmicrohttpd_project
INSTALL_COMMAND make install
)
add_library( microhttpd SHARED IMPORTED )
set_property( TARGET microhttpd PROPERTY IMPORTED_LOCATION "${CATKIN_DEVEL_PREFIX}/lib/libmicrohttpd.so")
add_dependencies( microhttpd libmicrohttpd_project )
ExternalProject_Add( libhttpserver
ExternalProject_Add( libhttpserver_project
DEPENDS libmicrohttpd_project
#SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/src/libhttpserver
DOWNLOAD_COMMAND cp -rf ${CMAKE_CURRENT_SOURCE_DIR}/src/libhttpserver ${CMAKE_CURRENT_BINARY_DIR} && cd ${CMAKE_CURRENT_BINARY_DIR}/libhttpserver && ./bootstrap
@@ -115,6 +123,10 @@ ExternalProject_Add( libhttpserver
INSTALL_COMMAND make install
)
add_library( httpserver SHARED IMPORTED )
set_property( TARGET httpserver PROPERTY IMPORTED_LOCATION "${CATKIN_DEVEL_PREFIX}/lib/libhttpserver.so")
add_dependencies( httpserver libhttpserver_project )
## Specify additional locations of header files
## Your package locations should be listed before other locations