Skip to content

Commit ada4b36

Browse files
author
Murilo M. Marinho
committed
[CMakeLists.txt/setup.py] Cleaning up installation, adding given the compilation issues in other systems.
1 parent ba44e00 commit ada4b36

File tree

2 files changed

+3
-16
lines changed

2 files changed

+3
-16
lines changed

CMakeLists.txt

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,16 @@ project(dqroboticspython)
99
set(CMAKE_CXX_STANDARD 17)
1010
set(CMAKE_CXX_STANDARD_REQUIRED ON)
1111

12+
add_compile_options(-Werror=return-type -Wall -Wextra -Wmissing-declarations -Wredundant-decls -Woverloaded-virtual -fPIC)
13+
1214
if(APPLE)
13-
find_package(cppzmq)
1415
message("Building not supported on this platform.")
1516
include_directories(
1617
/usr/local/include/
1718
/usr/local/include/eigen3
1819
/opt/homebrew/include
1920
/opt/homebrew/include/eigen3
2021
)
21-
add_compile_options(-Werror=return-type -Wall -Wextra -Wmissing-declarations -Wredundant-decls -Woverloaded-virtual)
22-
endif()
23-
24-
if(UNIX AND NOT APPLE)
25-
add_compile_options(-Werror=return-type -Wall -Wextra -Wmissing-declarations -Wredundant-decls -Woverloaded-virtual)
2622
endif()
2723

2824
if(WIN32)
@@ -93,10 +89,4 @@ pybind11_add_module(_dqrobotics
9389
set(BUILD_SHARED_LIBS FALSE CACHE BOOL "x" FORCE)
9490
add_subdirectory(cpp)
9591

96-
if(APPLE)
97-
target_link_libraries(_dqrobotics PRIVATE dqrobotics)
98-
endif()
99-
100-
if(UNIX AND NOT APPLE)
101-
target_link_libraries(_dqrobotics PRIVATE dqrobotics)
102-
endif()
92+
target_link_libraries(_dqrobotics PRIVATE dqrobotics)

setup.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,7 @@ def build_extension(self, ext):
7676
'dqrobotics.utils.DQ_Math',
7777
'dqrobotics.utils.DQ_LinearAlgebra',
7878
'dqrobotics.interfaces',
79-
'dqrobotics.interfaces.vrep',
80-
'dqrobotics.interfaces.vrep.robots',
8179
'dqrobotics.interfaces.json11',
82-
'dqrobotics.interfaces.coppeliasim',
8380
'dqrobotics.robot_control',
8481
'dqrobotics.solvers'],
8582
classifiers=[

0 commit comments

Comments
 (0)