@@ -3,48 +3,34 @@ cmake_minimum_required(VERSION 3.16.3)
33# ===================================================================
44# PROJECT SETUP
55# ===================================================================
6- project (flexiv_rdk VERSION 1.5.1 )
6+ project (flexiv_rdk VERSION 1.6.0 )
77
88# Configure build type
99if (NOT CMAKE_BUILD_TYPE )
1010 set (CMAKE_BUILD_TYPE Release CACHE STRING "CMake build type" FORCE)
1111endif ()
1212set_property (CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS "Release" "Debug" "RelWithDebInfo" )
1313
14- # Configure Python RDK
15- option (INSTALL_PYTHON_RDK "Install Python RDK (to user site packages path)" OFF )
16- if (INSTALL_PYTHON_RDK)
17- if (NOT RDK_PYTHON_VERSION)
18- set (RDK_PYTHON_VERSION 3.10 CACHE STRING "Python version to install RDK for" FORCE)
19- endif ()
20- set_property (CACHE RDK_PYTHON_VERSION PROPERTY STRINGS "3.10" "3.12" )
21- find_package (Python3 ${RDK_PYTHON_VERSION} EXACT COMPONENTS Interpreter REQUIRED)
22- endif ()
23-
24- # Set C++ and Python library filename
25- message ("OS: ${CMAKE_SYSTEM_NAME} " )
26- message ("Processor: ${CMAKE_SYSTEM_PROCESSOR} " )
14+ # Set static library according to platform
15+ message (STATUS "OS: ${CMAKE_SYSTEM_NAME} " )
16+ message (STATUS "Processor: ${CMAKE_SYSTEM_PROCESSOR} " )
2717if (${CMAKE_SYSTEM_NAME} MATCHES "Linux" )
2818 if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "x86_64" )
29- set (RDK_CPP_LIB "libflexiv_rdk.x86_64-linux-gnu.a" )
30- set (RDK_PY_LIB "flexivrdk.cpython-${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} -x86_64-linux-gnu.so" )
19+ set (RDK_STATIC_LIB "libflexiv_rdk.x86_64-linux-gnu.a" )
3120 elseif (${CMAKE_SYSTEM_PROCESSOR} MATCHES "aarch64" )
32- set (RDK_CPP_LIB "libflexiv_rdk.aarch64-linux-gnu.a" )
33- set (RDK_PY_LIB "flexivrdk.cpython-${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} -aarch64-linux-gnu.so" )
21+ set (RDK_STATIC_LIB "libflexiv_rdk.aarch64-linux-gnu.a" )
3422 else ()
3523 message (FATAL_ERROR "Linux with ${CMAKE_SYSTEM_PROCESSOR} processor is currently not supported." )
3624 endif ()
3725elseif (${CMAKE_SYSTEM_NAME} MATCHES "Darwin" )
3826 if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "arm64" )
39- set (RDK_CPP_LIB "libflexiv_rdk.arm64-darwin.a" )
40- set (RDK_PY_LIB "flexivrdk.cpython-${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} -darwin.so" )
27+ set (RDK_STATIC_LIB "libflexiv_rdk.arm64-darwin.a" )
4128 else ()
4229 message (FATAL_ERROR "Mac with ${CMAKE_SYSTEM_PROCESSOR} processor is currently not supported." )
4330 endif ()
4431elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows" )
4532 if (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64" )
46- set (RDK_CPP_LIB "flexiv_rdk.win_amd64.lib" )
47- set (RDK_PY_LIB "flexivrdk.cp${Python3_VERSION_MAJOR}${Python3_VERSION_MINOR} -win_amd64.pyd" )
33+ set (RDK_STATIC_LIB "flexiv_rdk.win_amd64.lib" )
4834 else ()
4935 message (FATAL_ERROR "Windows with ${CMAKE_SYSTEM_PROCESSOR} processor is currently not supported." )
5036 endif ()
@@ -79,7 +65,7 @@ if(fastrtps_FOUND)
7965endif ()
8066
8167# ===================================================================
82- # INSTALL C++ LIBRARY
68+ # CREATE LIBRARY
8369# ===================================================================
8470# Create an INTERFACE library with no source file to compile
8571add_library (${PROJECT_NAME} INTERFACE )
@@ -94,7 +80,7 @@ target_include_directories(${PROJECT_NAME} INTERFACE
9480)
9581
9682target_link_libraries (${PROJECT_NAME} INTERFACE
97- ${CMAKE_CURRENT_SOURCE_DIR} /lib/${RDK_CPP_LIB }
83+ ${CMAKE_CURRENT_SOURCE_DIR} /lib/${RDK_STATIC_LIB }
9884 Threads::Threads
9985 Eigen3::Eigen
10086 spdlog::spdlog
@@ -109,24 +95,5 @@ else()
10995endif ()
11096
11197# Install the INTERFACE library
112- message (STATUS "C++ RDK library: ${RDK_CPP_LIB} " )
11398include (${CMAKE_CURRENT_SOURCE_DIR} /cmake/FlexivInstallLibrary.cmake)
11499FlexivInstallLibrary()
115-
116- # ===================================================================
117- # INSTALL PYTHON LIBRARY
118- # ===================================================================
119- if (INSTALL_PYTHON_RDK)
120- # Get user site packages path
121- message (STATUS "Python executable: ${Python3_EXECUTABLE} " )
122- execute_process (
123- COMMAND ${Python3_EXECUTABLE} -c "import site; print(site.getusersitepackages())"
124- OUTPUT_VARIABLE USER_SITE
125- OUTPUT_STRIP_TRAILING_WHITESPACE
126- )
127- message (STATUS "Python site packages path: ${USER_SITE} " )
128-
129- # Install Python RDK to user site packages path
130- message (STATUS "Python RDK library: ${RDK_PY_LIB} " )
131- install (FILES "${CMAKE_CURRENT_SOURCE_DIR} /lib_py/${RDK_PY_LIB} " DESTINATION ${USER_SITE} )
132- endif ()
0 commit comments