Commit 1a7ed355 authored by Florent Lamiraux's avatar Florent Lamiraux Committed by Florent Lamiraux florent@laas.fr
Browse files

Fix CMakeLists.txt files

parent 8a2b5602
...@@ -53,7 +53,7 @@ IF(ENABLE_BODY) ...@@ -53,7 +53,7 @@ IF(ENABLE_BODY)
) )
ELSE(ENABLE_BODY) ELSE(ENABLE_BODY)
MESSAGE(STATUS "using external implementation of hpp::model::Body") MESSAGE(STATUS "using external implementation of hpp::model::Body")
ADD_REQUIRED_DEPENDENCY("hpp-model >= 2.0") ADD_REQUIRED_DEPENDENCY("hpp-model >= 1.8")
ENDIF(ENABLE_BODY) ENDIF(ENABLE_BODY)
# Declare Headers # Declare Headers
......
...@@ -31,16 +31,12 @@ IF (ENABLE_BODY) ...@@ -31,16 +31,12 @@ IF (ENABLE_BODY)
body.cc body.cc
) )
INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/include/hpp-model) INCLUDE_DIRECTORIES(BEFORE ${CMAKE_SOURCE_DIR}/include/hpp-model)
ADD_LIBRARY(${LIBRARY_NAME}
SHARED
${LIBRARY_NAME}_SOURCES
)
SET(${LIBRARY_NAME}_SOURCE_FILES SET(${LIBRARY_NAME}_SOURCE_FILES
${${LIBRARY_NAME}_SOURCE_FILES} ${${LIBRARY_NAME}_SOURCE_FILES}
body.cc) body.cc)
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})
ENDIF() ENDIF()
ADD_LIBRARY(${LIBRARY_NAME}
SHARED
${${LIBRARY_NAME}_SOURCES}
)
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