Commit 353bc92e authored by Nicolas Mansard's avatar Nicolas Mansard Committed by Nicolas Mansard
Browse files

[CMake] Solved bug #236. Marginally changed the source/header listing policy...

[CMake] Solved bug #236. Marginally changed the source/header listing policy to avoid similar bugs in the future.
parent 4c43a837
......@@ -153,7 +153,6 @@ SET(${PROJECT_NAME}_MULTIBODY_JOINT_HEADERS
multibody/joint/joint-basic-visitors.hxx
)
SET(${PROJECT_NAME}_MULTIBODY_HEADERS
multibody/fwd.hpp
multibody/constraint.hpp
......@@ -164,12 +163,6 @@ SET(${PROJECT_NAME}_MULTIBODY_HEADERS
multibody/visitor.hpp
)
SET(${PROJECT_NAME}_PARSERS_HEADERS
parsers/sample-models.hpp
parsers/utils.hpp
parsers/srdf.hpp
)
SET(${PROJECT_NAME}_ALGORITHM_HEADERS
algorithm/aba.hpp
algorithm/aba.hxx
......@@ -214,19 +207,29 @@ IF(BUILD_PYTHON_INTERFACE)
python/explog.hpp
)
LIST(APPEND ${PROJECT_NAME}_PARSERS_HEADERS
parsers/python.hpp
)
ENDIF(BUILD_PYTHON_INTERFACE)
IF(HPP_FCL_FOUND AND BUILD_PYTHON_INTERFACE)
LIST(APPEND ${PROJECT_NAME}_PYTHON_HEADERS
IF(HPP_FCL_FOUND)
LIST(APPEND ${PROJECT_NAME}_PYTHON_HEADERS
python/geometry-object.hpp
python/geometry-model.hpp
python/geometry-data.hpp
)
ENDIF(HPP_FCL_FOUND AND BUILD_PYTHON_INTERFACE)
)
ENDIF(HPP_FCL_FOUND)
ELSE(BUILD_PYTHON_INTERFACE)
SET(${PROJECT_NAME}_PYTHON_HEADERS "")
ENDIF(BUILD_PYTHON_INTERFACE)
SET(${PROJECT_NAME}_PARSERS_HEADERS
parsers/sample-models.hpp
parsers/utils.hpp
parsers/srdf.hpp
)
IF(BUILD_PYTHON_INTERFACE)
LIST(APPEND ${PROJECT_NAME}_PARSERS_HEADERS
parsers/python.hpp
)
ENDIF(BUILD_PYTHON_INTERFACE)
IF(URDFDOM_FOUND)
LIST(APPEND ${PROJECT_NAME}_PARSERS_HEADERS
......@@ -235,7 +238,7 @@ IF(URDFDOM_FOUND)
parsers/urdf/utils.hpp
)
IF(HPP_FCL_FOUND )
IF(HPP_FCL_FOUND)
LIST(APPEND ${PROJECT_NAME}_PARSERS_HEADERS
parsers/urdf/geometry.hxx
)
......
......@@ -52,26 +52,23 @@ SET(${PROJECT_NAME}_PARSERS_SOURCES
)
IF(BUILD_PYTHON_INTERFACE)
SET(${PROJECT_NAME}_PARSERS_PYTHON_SOURCES
parsers/python.cpp
)
ENDIF(BUILD_PYTHON_INTERFACE)
SET(${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_MULTIBODY_SOURCES})
IF(BUILD_PYTHON_INTERFACE)
LIST(APPEND ${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_PARSERS_SOURCES}
${${PROJECT_NAME}_PARSERS_PYTHON_SOURCES})
LIST(APPEND ${PROJECT_NAME}_PARSERS_SOURCES
parsers/python.cpp
)
ENDIF(BUILD_PYTHON_INTERFACE)
IF(LUA5_1_FOUND)
SET(${PROJECT_NAME}_MULTIBODY_PARSER_LUA_SOURCES
LIST(APPEND ${PROJECT_NAME}_PARSER_SOURCES
parsers/lua/lua_tables.cpp
parsers/lua.cpp
)
LIST(APPEND ${PROJECT_NAME}_SOURCES ${${PROJECT_NAME}_MULTIBODY_PARSER_LUA_SOURCES})
ENDIF(LUA5_1_FOUND)
SET(${PROJECT_NAME}_SOURCES
${${PROJECT_NAME}_MULTIBODY_SOURCES}
${${PROJECT_NAME}_PARSERS_SOURCES}
)
IF(UNIX)
# Create target libpinocchio.so
ADD_LIBRARY ( ${PROJECT_NAME} SHARED ${HEADERS} ${${PROJECT_NAME}_SOURCES} )
......
Markdown is supported
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