atria-soft/etk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEV] set catkin correct dependency

Browse Source
This commit is contained in:
Edouard DUPIN 2015-03-18 23:43:06 +01:00
parent 51bc7746e4
commit 493bf653d5
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
catkin/CMakeLists.txt
View File

@ -9,6 +9,10 @@ set(CMAKE_VERBOSE_MAKEFILE ON)
find_package(catkin) find_package(catkin)
#set(ETK_DEFINITIONS -D__CPP_VERSION__=2011 -D__TARGET_OS__Linux -DETK_EXTERN_FRAMEWORK_ROS)
#set(etk_DEFINITIONS -D__CPP_VERSION__=2011 -D__TARGET_OS__Linux -DETK_EXTERN_FRAMEWORK_ROS)
################################### ###################################
## catkin specific configuration ## ## catkin specific configuration ##
################################### ###################################
@ -22,6 +26,7 @@ catkin_package(
INCLUDE_DIRS ../ ../binding_X11 INCLUDE_DIRS ../ ../binding_X11
LIBRARIES ${PROJECT_NAME} LIBRARIES ${PROJECT_NAME}
DEPENDS system_lib DEPENDS system_lib
CFG_EXTRAS ${PROJECT_NAME}-extras.cmake
) )
########### ###########
@ -54,12 +59,7 @@ add_library(${PROJECT_NAME}
../${PROJECT_NAME}/archive/Zip.cpp ../${PROJECT_NAME}/archive/Zip.cpp
) )
set(CMAKE_CXX_FLAGS "-std=c++11 -DDEBUG_LEVEL=3 -DDEBUG=1 -D__CPP_VERSION__=2011 -D__TARGET_OS__Linux -DETK_EXTERN_FRAMEWORK_ROS") set(CMAKE_CXX_FLAGS "-std=c++11 -D__CPP_VERSION__=2011 -D__TARGET_OS__Linux -DETK_EXTERN_FRAMEWORK_ROS")
## Add cmake target dependencies of the executable/library
## as an example, message headers may need to be generated before nodes
#add_dependencies(${PROJECT_NAME} test_perfo_core_generate_messages_cpp)
## Specify libraries to link a library or executable target against ## Specify libraries to link a library or executable target against
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}

4
catkin/cmake/etk-extras.cmake Normal file
View File

@ -0,0 +1,4 @@
set(CMAKE_CXX_FLAGS "-std=c++11 -D__CPP_VERSION__=2011 -D__TARGET_OS__Linux -DETK_EXTERN_FRAMEWORK_ROS ${CMAKE_CXX_FLAGS}")