|
1 | 1 | cmake_minimum_required(VERSION 2.8.3)
|
2 |
| -project(faster) |
| 2 | +project(mader) |
3 | 3 |
|
4 | 4 |
|
5 | 5 |
|
@@ -49,15 +49,15 @@ set(CMAKE_BUILD_TYPE Release) #From terminal: catkin config -DCMAKE_BUILD_TYPE=R
|
49 | 49 |
|
50 | 50 |
|
51 | 51 | #First of all, compile the CVXGEN files
|
52 |
| -# add_custom_command(OUTPUT libcvx.so COMMAND make -C /home/jtorde/Desktop/ws/src/faster/faster/src/solvers/cvxgen/cvxgen) |
| 52 | +# add_custom_command(OUTPUT libcvx.so COMMAND make -C /home/jtorde/Desktop/ws/src/mader/mader/src/solvers/cvxgen/cvxgen) |
53 | 53 | # add_custom_target(cvxgen_is_compiled ALL DEPENDS libcvx.so)
|
54 | 54 |
|
55 | 55 |
|
56 | 56 | find_package(catkin REQUIRED COMPONENTS
|
57 | 57 | roscpp
|
58 | 58 | rospy
|
59 | 59 | snapstack_msgs
|
60 |
| - faster_msgs |
| 60 | + mader_msgs |
61 | 61 | sensor_msgs
|
62 | 62 | decomp_util
|
63 | 63 | decomp_ros_utils
|
@@ -102,20 +102,20 @@ target_include_directories (solverNlopt PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${DEC
|
102 | 102 | target_link_libraries(solverNlopt PUBLIC ${NLOPT_LIBRARIES} ${DECOMP_UTIL_LIBRARIES} utils spline_AStar ${catkin_LIBRARIES} cgal_utils)
|
103 | 103 |
|
104 | 104 |
|
105 |
| -# add_library(faster STATIC src/faster.cpp src/faster.hpp) |
106 |
| -# #set_property(TARGET faster PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${iwyu_path}) |
107 |
| -# target_include_directories (faster PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) |
108 |
| -# target_link_libraries(faster PUBLIC utils ${CGAL_LIBS} solverNlopt) |
| 105 | +# add_library(mader STATIC src/mader.cpp src/mader.hpp) |
| 106 | +# #set_property(TARGET mader PROPERTY CXX_INCLUDE_WHAT_YOU_USE ${iwyu_path}) |
| 107 | +# target_include_directories (mader PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) |
| 108 | +# target_link_libraries(mader PUBLIC utils ${CGAL_LIBS} solverNlopt) |
109 | 109 |
|
110 | 110 |
|
111 |
| -# add_library(faster_ros STATIC src/faster_ros.cpp src/faster_ros.hpp src/faster.cpp src/faster.hpp) |
112 |
| -# target_include_directories (faster_ros PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) |
113 |
| -# target_link_libraries(faster_ros PUBLIC ${catkin_LIBRARIES} solverNlopt utils) |
| 111 | +# add_library(mader_ros STATIC src/mader_ros.cpp src/mader_ros.hpp src/mader.cpp src/mader.hpp) |
| 112 | +# target_include_directories (mader_ros PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) |
| 113 | +# target_link_libraries(mader_ros PUBLIC ${catkin_LIBRARIES} solverNlopt utils) |
114 | 114 |
|
115 | 115 |
|
116 | 116 | # enable_unity_build(UNITY_BUILD_NAME src/main.cpp)
|
117 | 117 |
|
118 |
| -add_executable(${PROJECT_NAME}_node src/main.cpp src/faster_ros.cpp src/faster_ros.hpp src/faster.cpp src/faster.hpp) |
| 118 | +add_executable(${PROJECT_NAME}_node src/main.cpp src/mader_ros.cpp src/mader_ros.hpp src/mader.cpp src/mader.hpp) |
119 | 119 | target_link_libraries(${PROJECT_NAME}_node PUBLIC ${catkin_LIBRARIES} solverNlopt utils) #${CGAL_LIBS}
|
120 | 120 | add_dependencies(${PROJECT_NAME}_node ${catkin_EXPORTED_TARGETS} )
|
121 | 121 |
|
|
0 commit comments