Skip to content

Commit

Permalink
Merge pull request #237 from pariterre/master
Browse files Browse the repository at this point in the history
Fixed Azure for UNIX
  • Loading branch information
pariterre authored Oct 5, 2021
2 parents e53f571 + bb8f704 commit 2c3d0d6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
8 changes: 4 additions & 4 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ elseif(${MATH_LIBRARY_BACKEND} STREQUAL "Casadi")
)
set(MATH_BACKEND_LIBRARIES "${Casadi_LIBRARY}")
find_package(RBDLCasadi REQUIRED)
set(RBDL_INCLUDE_DIR ${RBDLCasadi_INCLUDE_DIR})
set(RBDL_INCLUDE_DIR ${RBDLCasadi_INCLUDE_DIR} ${RBDLCasadi_INCLUDE_DIR}/rbdl-casadi)
set(RBDL_LIBRARY ${RBDLCasadi_LIBRARY})
endif()
find_package(IPOPT)
Expand Down Expand Up @@ -153,7 +153,7 @@ if(WIN32)
set(${BIORBD_NAME}_LIB_FOLDER "Lib")
set(${BIORBD_NAME}_BIN_FOLDER "bin")
set(${BIORBD_NAME}_INCLUDE_FOLDER "include/${BIORBD_NAME}")
set(${BIORBD_NAME}_CMAKECONFIG_DIR "Lib/cmake/${BIORBD_NAME}")
set(${BIORBD_NAME}_CMAKECONFIG_DIR "Lib/cmake/${BIORBD_NAME}")
else()
set(${BIORBD_NAME}_LIB_FOLDER "lib/${BIORBD_NAME}")
set(${BIORBD_NAME}_BIN_FOLDER "${CMAKE_INSTALL_PREFIX}/lib/${BIORBD_NAME}")
Expand Down Expand Up @@ -233,7 +233,7 @@ configure_package_config_file(
"${BIORBD_BINARY_DIR}/${BIORBD_NAME}Config.cmake"
INSTALL_DESTINATION "${CMAKE_SHARE_DIR}"
)
install(FILES
install(FILES
"${BIORBD_BINARY_DIR}/${BIORBD_NAME}Config.cmake"
DESTINATION "${CMAKE_SHARE_DIR}"
)
Expand All @@ -252,7 +252,7 @@ if(NOT TARGET uninstall)
)
endif()


# Add binding subdirectory
add_subdirectory("binding")

Expand Down
1 change: 0 additions & 1 deletion include/ModelReader.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include <vector>
#include <map>
#include "biorbdConfig.h"
#include "rbdl/rbdl_math.h"

namespace BIORBD_NAMESPACE
{
Expand Down

0 comments on commit 2c3d0d6

Please sign in to comment.