Skip to content

Commit d65b89c

Browse files
committed
solved compilation issues
1 parent 48a2aca commit d65b89c

3 files changed

Lines changed: 13 additions & 13 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -289,7 +289,7 @@ find_package(GLPK QUIET)
289289
if(${GLPK_FOUND})
290290
message("Adding src/solvers/GLPKBackEnd.cpp to compilation")
291291
add_library(OpenSotBackEndGLPK SHARED src/solvers/GLPKBackEnd.cpp)
292-
target_link_libraries(OpenSotBackEndGLPK OpenSoT ${GLPK_LIBRARY})
292+
target_link_libraries(OpenSotBackEndGLPK OpenSoT matlogger2::matlogger2 ${GLPK_LIBRARY})
293293
library_install(OpenSotBackEndGLPK 1 0 0)
294294
endif()
295295

bindings/python/CMakeLists.txt

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -93,24 +93,25 @@ if(${pybind11_FOUND})
9393
LIBRARY DESTINATION "~/.local/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages"
9494
ARCHIVE DESTINATION "lib"
9595
RUNTIME DESTINATION "bin")
96-
endif()
9796

9897

9998

100-
set(OPENSOT_BINDINGS_oc_SOURCES pyopensot_oc.cpp oc.hpp)
99+
set(OPENSOT_BINDINGS_oc_SOURCES pyopensot_oc.cpp oc.hpp)
101100

102-
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
103-
pybind11_add_module(pyopensot_oc ${OPENSOT_BINDINGS_oc_SOURCES})
101+
include_directories(${CMAKE_CURRENT_SOURCE_DIR})
102+
pybind11_add_module(pyopensot_oc ${OPENSOT_BINDINGS_oc_SOURCES})
104103

105-
target_link_libraries(pyopensot_oc PUBLIC OpenSoT OpenSothpipmOC)
104+
target_link_libraries(pyopensot_oc PUBLIC OpenSoT OpenSothpipmOC)
106105

107-
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
106+
find_package(Python3 COMPONENTS Interpreter Development REQUIRED)
108107

109-
install(TARGETS pyopensot_oc
110-
COMPONENT python
111-
LIBRARY DESTINATION "~/.local/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages"
112-
ARCHIVE DESTINATION "lib"
113-
RUNTIME DESTINATION "bin")
108+
install(TARGETS pyopensot_oc
109+
COMPONENT python
110+
LIBRARY DESTINATION "~/.local/lib/python${Python3_VERSION_MAJOR}.${Python3_VERSION_MINOR}/site-packages"
111+
ARCHIVE DESTINATION "lib"
112+
RUNTIME DESTINATION "bin")
113+
114+
endif()
114115

115116

116117
else()

src/solvers/GLPKBackEnd.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
#include <OpenSoT/solvers/GLPKBackEnd.h>
2-
#include <OpenSoT/utils/SoLib.h>
32
#include <memory>
43
#include <boost/date_time.hpp>
54

0 commit comments

Comments
 (0)