Skip to content

Commit de5d2f8

Browse files
committed
updated ubuntu build script, removed default include headers
1 parent 6e42fd9 commit de5d2f8

File tree

7 files changed

+27
-4
lines changed

7 files changed

+27
-4
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,4 +199,7 @@ Thumbs.db
199199

200200
.eggs/
201201
*.egg-info/
202-
.vscode/
202+
.vscode/
203+
204+
include/
205+
lib/

CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,12 @@ if(UNIX)
3232
# ISA_NAME is set by cmake_host_system_information above
3333
if(ISA_NAME STREQUAL "aarch64")
3434
target_include_directories(xrobotoolkit_sdk PUBLIC
35-
${PROJECT_SOURCE_DIR}/lib/aarch64
35+
${PROJECT_SOURCE_DIR}/include/aarch64
3636
)
3737
target_link_directories(xrobotoolkit_sdk PUBLIC ${PROJECT_SOURCE_DIR}/lib/aarch64)
3838
else()
3939
target_include_directories(xrobotoolkit_sdk PUBLIC
40-
${PROJECT_SOURCE_DIR}/lib
40+
${PROJECT_SOURCE_DIR}/include
4141
)
4242
target_link_directories(xrobotoolkit_sdk PUBLIC ${PROJECT_SOURCE_DIR}/lib)
4343
endif()

include/.gitkeep

Whitespace-only changes.

lib/.gitkeep

Whitespace-only changes.

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def build_extension(self, ext):
4444
cmake_args = [
4545
"-DCMAKE_LIBRARY_OUTPUT_DIRECTORY=" + extdir,
4646
"-DPYTHON_EXECUTABLE=" + sys.executable,
47-
# Add other CMake arguments if needed
47+
"-DCMAKE_BUILD_TYPE=Release",
4848
]
4949

5050
cfg = "Debug" if self.debug else "Release"

setup_ubuntu.sh

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ git clone https://github.com/XR-Robotics/XRoboToolkit-PC-Service.git
66
cd XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK
77
bash build.sh
88
cd ../../../..
9+
10+
mkdir -p lib
11+
mkdir -p include
12+
cp tmp/XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK/PXREARobotSDK.h include/
13+
cp -r tmp/XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK/nlohmann include/nlohmann/
914
cp tmp/XRoboToolkit-PC-Service/RoboticsService/PXREARobotSDK/build/libPXREARobotSDK.so lib/
1015
rm -rf tmp
1116

setup_windows.bat

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,21 @@ set "PXREAROBOTSDK_LIB_DIR=%XROBOTKIT_CLONED_REPO_PATH%\RoboticsService\SDK\win\
1717
:: Define destination directories
1818
set "LIB_DEST_DIR=%SCRIPT_ROOT%\lib"
1919
set "INCLUDE_DEST_DIR=%SCRIPT_ROOT%\include"
20+
:: Create destination directories
21+
echo Creating destination directories...
22+
mkdir "%LIB_DEST_DIR%" 2>NUL
23+
if not exist "%LIB_DEST_DIR%" (
24+
echo Error: Failed to create lib directory. Exiting.
25+
exit /b 1
26+
)
27+
28+
mkdir "%INCLUDE_DEST_DIR%" 2>NUL
29+
if not exist "%INCLUDE_DEST_DIR%" (
30+
echo Error: Failed to create include directory. Exiting.
31+
exit /b 1
32+
)
33+
34+
echo Destination directories created successfully.
2035

2136
set "DLL_NAME=PXREARobotSDK.dll"
2237
set "LIB_NAME=PXREARobotSDK.lib"

0 commit comments

Comments
 (0)