rosbuild2 taking shape.
This commit is contained in:
Troy Straszheim
parent
85f56aace0
commit
2ce2f74819
|
|
@ -1,87 +1,33 @@
|
|||
include(${CMAKE_CURRENT_BINARY_DIR}/package.cmake)
|
||||
# We can't use rosbuild/rosbuild.cmake here, because rosbuild.cmake
|
||||
# requires rospack, and we're in the process of building rospack.
|
||||
set(CMAKE_INSTALL_PREFIX /tmp/rospack)
|
||||
#set(CMAKE_INSTALL_RPATH_USE_LINK_RPATH true)
|
||||
#set(CMAKE_SKIP_BUILD_RPATH true)
|
||||
set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
|
||||
|
||||
include_directories(include ${PROJECT_SOURCE_DIR})
|
||||
# Include the rosbuild's rosconfig.cmake, which includes logic for checking
|
||||
# for $ROS_ROOT/rosconfig.cmake, where the user may have adjusted the build
|
||||
# configuration. In particular, that's where static vs. shared is set.
|
||||
|
||||
add_definitions(-DTIXML_USE_STL)
|
||||
set(rospack_sources rospack.cpp tinyxml-2.5.3/tinystr.cpp tinyxml-2.5.3/tinyxml.cpp tinyxml-2.5.3/tinyxmlparser.cpp tinyxml-2.5.3/tinyxmlerror.cpp)
|
||||
|
||||
set(rospack_sources rospack.cpp
|
||||
tinyxml-2.5.3/tinystr.cpp
|
||||
tinyxml-2.5.3/tinyxml.cpp
|
||||
tinyxml-2.5.3/tinyxmlparser.cpp
|
||||
tinyxml-2.5.3/tinyxmlerror.cpp)
|
||||
|
||||
set(rosstack_sources rosstack.cpp)
|
||||
# Here we duplicate a bit of the logic in rosbuild/public.cmake.
|
||||
if(NOT ROS_BUILD_STATIC_LIBS AND NOT ROS_BUILD_SHARED_LIBS)
|
||||
message(FATAL_ERROR "Neithersharednorstaticlibrariesareenabled.PleaseseteitherROS_BUILD_STATIC_LIBSorROS_BUILD_SHARED_LIBStotrue.")
|
||||
endif(NOT ROS_BUILD_STATIC_LIBS AND NOT ROS_BUILD_SHARED_LIBS)
|
||||
if(ROS_BUILD_STATIC_EXES AND ROS_BUILD_SHARED_LIBS)
|
||||
message(FATAL_ERROR "Staticexecutablesarerequested,butsoaresharedlibs.Thisconfigurationisunsupported.PleaseeithersetROS_BUILD_SHARED_LIBStofalseorsetROS_BUILD_STATIC_EXEStofalse.")
|
||||
endif(ROS_BUILD_STATIC_EXES AND ROS_BUILD_SHARED_LIBS)
|
||||
if(ROS_BUILD_SHARED_LIBS)
|
||||
# If shared libs are being built, they get the default CMake target name
|
||||
# No matter what, the libraries get the same name in the end.
|
||||
add_library(rospack SHARED ${rospack_sources})
|
||||
add_library(rosstack SHARED ${rosstack_sources})
|
||||
# Prevent deletion of existing lib of same name
|
||||
set_target_properties(rospack PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
||||
set_target_properties(rosstack PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
||||
endif(ROS_BUILD_SHARED_LIBS)
|
||||
if(ROS_BUILD_STATIC_LIBS)
|
||||
add_definitions("-DROS_STATIC")
|
||||
# If we're only building static libs, then they get the default CMake
|
||||
# target name.
|
||||
if(NOT ROS_BUILD_SHARED_LIBS)
|
||||
set(static_rospack "rospack")
|
||||
set(static_rosstack "rosstack")
|
||||
else(NOT ROS_BUILD_SHARED_LIBS)
|
||||
set(static_rospack "rospack-static")
|
||||
set(static_rosstack "rosstack-static")
|
||||
endif(NOT ROS_BUILD_SHARED_LIBS)
|
||||
add_library(${static_rospack} STATIC ${rospack_sources})
|
||||
add_library(${static_rosstack} STATIC ${rosstack_sources})
|
||||
# Set output name to be the same as shared lib (may not work on Windows)
|
||||
set_target_properties(${static_rospack} PROPERTIES OUTPUT_NAME "rospack")
|
||||
set_target_properties(${static_rosstack} PROPERTIES OUTPUT_NAME "rosstack")
|
||||
# Also add -fPIC, because CMake leaves it out when building static
|
||||
# libs, even though it's necessary on 64-bit machines for linking this
|
||||
# lib against shared libs downstream.
|
||||
set_target_properties(${static_rospack} PROPERTIES COMPILE_FLAGS "-fPIC")
|
||||
set_target_properties(${static_rosstack} PROPERTIES COMPILE_FLAGS "-fPIC")
|
||||
# Prevent deletion of existing lib of same name
|
||||
set_target_properties(${static_rospack} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
||||
set_target_properties(${static_rosstack} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
|
||||
endif(ROS_BUILD_STATIC_LIBS)
|
||||
add_executable(rospackexe main.cpp)
|
||||
|
||||
rosbuild_add_library(rospack ${rospack_sources})
|
||||
rosbuild_add_library(rosstack ${rosstack_sources})
|
||||
|
||||
rosbuild_add_executable(rospackexe main.cpp)
|
||||
set_target_properties(rospackexe PROPERTIES OUTPUT_NAME rospack)
|
||||
target_link_libraries(rosstack rospack)
|
||||
add_executable(rosstackexe rosstack_main.cpp)
|
||||
|
||||
rosbuild_add_executable(rosstackexe rosstack_main.cpp)
|
||||
set_target_properties(rosstackexe PROPERTIES OUTPUT_NAME rosstack)
|
||||
target_link_libraries(rospackexe rospack)
|
||||
target_link_libraries(rosstackexe rosstack rospack)
|
||||
if(ROS_BUILD_STATIC_EXES AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
# This will probably only work on Linux. The LINK_SEARCH_END_STATIC
|
||||
# property should be sufficient, but it doesn't appear to work
|
||||
# properly.
|
||||
set_target_properties(rospackexe PROPERTIES LINK_FLAGS "-static-libgcc-Wl,-Bstatic")
|
||||
set_target_properties(rosstackexe PROPERTIES LINK_FLAGS "-static-libgcc-Wl,-Bstatic")
|
||||
endif(ROS_BUILD_STATIC_EXES AND ${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
|
||||
#install(TARGETS rospack rosstack rospackexe rosstackexe
|
||||
# RUNTIME DESTINATION bin
|
||||
# LIBRARY DESTINATION lib)
|
||||
#install(FILES include/rospack/rospack.h
|
||||
# DESTINATION include/rospack)
|
||||
# Prevent warnings about duplicate definition of the targets mentioned
|
||||
# below
|
||||
if(COMMAND cmake_policy)
|
||||
# Logical target names must be globally unique.
|
||||
cmake_policy(SET CMP0002 OLD)
|
||||
endif(COMMAND cmake_policy)
|
||||
# These targets might be called by rosmakeall
|
||||
add_custom_target(test)
|
||||
add_custom_target(tests)
|
||||
add_custom_target(test-results)
|
||||
add_custom_target(test-future)
|
||||
add_custom_target(gcoverage)
|
||||
|
||||
install(TARGETS rospack rosstack rospackexe rosstackexe
|
||||
RUNTIME DESTINATION bin
|
||||
LIBRARY DESTINATION lib)
|
||||
|
||||
install(FILES include/rospack/rospack.h
|
||||
DESTINATION include/rospack)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue