Skip to content

Commit 990a09d

Browse files
authored
Fix compilation on Windows after adding taped test (#279)
1 parent 2119417 commit 990a09d

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

setup.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -108,13 +108,13 @@ def main():
108108
return 0
109109

110110
# Install taped test dependencies
111-
if args.install_taped_test_deps:
111+
if on_linux() and args.install_taped_test_deps:
112112
install_taped_test_deps(cfg)
113113
print('Installed dependencies for taped test, exiting...')
114114
return 0
115115

116116
# Check taped test requirements
117-
if args.build_taped_test and not args.with_pcl:
117+
if on_linux() and args.build_taped_test and not args.with_pcl:
118118
raise RuntimeError(
119119
"Taped test requires PCL extension to be built: run this script with --with-pcl flag")
120120

@@ -154,8 +154,7 @@ def main():
154154
f"-DRGL_BUILD_PCL_EXTENSION={'ON' if args.with_pcl else 'OFF'}",
155155
f"-DRGL_BUILD_ROS2_EXTENSION={'ON' if args.with_ros2 else 'OFF'}",
156156
f"-DRGL_BUILD_UDP_EXTENSION={'ON' if args.with_udp else 'OFF'}",
157-
f"-DRGL_BUILD_SNOW_EXTENSION={'ON' if args.with_snow else 'OFF'}",
158-
f"-DRGL_BUILD_TAPED_TESTS={'ON' if args.build_taped_test else 'OFF'}"
157+
f"-DRGL_BUILD_SNOW_EXTENSION={'ON' if args.with_snow else 'OFF'}"
159158
]
160159

161160
if on_linux():
@@ -166,6 +165,8 @@ def main():
166165
rpath = rpath.replace("$ORIGIN", "\\$ORIGIN") # cmake should not treat this as variable
167166
linker_rpath_flags.append(f"-Wl,-rpath={rpath}")
168167
cmake_args.append(f"-DCMAKE_SHARED_LINKER_FLAGS=\"{' '.join(linker_rpath_flags)}\"")
168+
# Taped tests
169+
cmake_args.append(f"-DRGL_BUILD_TAPED_TESTS={'ON' if args.build_taped_test else 'OFF'}")
169170

170171
# Append user args, possibly overwriting
171172
cmake_args.append(args.cmake)

0 commit comments

Comments
 (0)