Commit a401bc94 authored by florent's avatar florent
Browse files

Declare old style headers as deprecated

	* include/CMakeLists.txt,
	* src/CMakeLists.txt: include priorly local headers,
	* src/hppColPair.cpp: include new headers,
	* src/hppPlanner.cpp: include new headers,
	* src/hppProblem.cpp: include new headers.
parent 77c605ba
......@@ -3,19 +3,34 @@
# Author: Florent Lamiraux
#
SET(${PROJECT_NAME}_HEADERS
#----------------------------------------------------
# Install old style deprecated header files
#----------------------------------------------------
SET(${PROJECT_NAME}_HEADERS_OLD_STYLE
hppCore/hppColPair.h
hppCore/hppPlanner.h
hppCore/hppProblem.h
)
INSTALL(FILES ${${PROJECT_NAME}_HEADERS_OLD_STYLE}
DESTINATION include/${PROJECT_NAME}
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
)
#----------------------------------------------------
# Install procedure for the header files
# Install new style header files
#----------------------------------------------------
SET(${PROJECT_NAME}_HEADERS
hpp/core/planner.hh
hpp/core/problem.hh
hpp/core/collision-pair.hh
)
INSTALL(FILES ${${PROJECT_NAME}_HEADERS}
DESTINATION include/${PROJECT_NAME}
DESTINATION include/hpp/core
PERMISSIONS OWNER_READ GROUP_READ WORLD_READ OWNER_WRITE
)
)
IF(${ENABLE_BODY} STREQUAL YES)
SET(${PROJECT_NAME}_HEADERS hppModel/hppModel/hppBody.h)
......
......@@ -34,12 +34,13 @@ IF(WIN32)
ENDIF(WIN32)
IF(${ENABLE_BODY} STREQUAL YES)
INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/include/hppModel)
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/include/hppModel)
SET(${LIBRARY_NAME}_SOURCE_FILES
${${LIBRARY_NAME}_SOURCE_FILES}
hppBody.cpp)
ELSE(${ENABLE_BODY} STREQUAL YES)
# Add hppModel compilation flags and link to library libhppModel.so
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/include)
ADD_DEFINITIONS(${HPPMODEL_CFLAGS})
SET(${LIBRARY_NAME}_SOURCE_FILES
${${LIBRARY_NAME}_SOURCE_FILES}
......
#include "hppCore/hppColPair.h"
#include "hpp/core/collision-pair.hh"
#include <algorithm>
......
......@@ -19,8 +19,8 @@
#include "KineoModel/kppDeviceComponent.h"
#include "hppCore/hppPlanner.h"
#include "hppCore/hppProblem.h"
#include "hpp/core/planner.hh"
#include "hpp/core/problem.hh"
#include "humanoid-robot.hh"
#include "hppModel/hppBody.h"
#include <hppModel/hppHumanoidRobot.h>
......
......@@ -12,7 +12,7 @@
#include <iostream>
#include "hppCore/hppProblem.h"
#include "hpp/core/problem.hh"
#include "hppModel/hppBody.h"
#include "KineoWorks2/kwsConfigExtractor.h"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment