Support for BUILD_TYPE in Conda

Signed-off-by: Jose Luis Rivero <[email protected]>
gazebo-tooling · Dec 2, 2024 · fcbc6fb · fcbc6fb
1 parent d98da15
commit fcbc6fb
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/jenkins-scripts/lib/windows_library.bat b/jenkins-scripts/lib/windows_library.bat
@@ -210,16 +210,13 @@ set MAKEFLAGS=-j%MAKE_JOBS%
 echo "COLCON_EXTRA_ARGS: %COLCON_EXTRA_ARGS% %COLCON_PACKAGE%"
 
 if defined USE_PIXI (
-  if defined COLCON_EXTRA_CMAKE_ARGS (
-    set COLCON_EXTRA_CMAKE_ARGS_STR=--cmake-args %COLCON_EXTRA_CMAKE_ARGS% %COLCON_EXTRA_CMAKE_ARGS2%
-    echo "COLCON_EXTRA_CMAKE_ARGS_STR:" !COLCON_EXTRA_CMAKE_ARGS_STR!
-  )
   @echo on
   colcon build --build-base "build"^
     --install-base "install"^
     --parallel-workers %MAKE_JOBS%^
     %COLCON_EXTRA_ARGS% %COLCON_PACKAGE%^
-    !COLCON_EXTRA_CMAKE_ARGS_STR!^
+    --cmake-args " -DCMAKE_BUILD_TYPE=%BUILD_TYPE%"^
+    %COLCON_EXTRA_CMAKE_ARGS% %COLCON_EXTRA_CMAKE_ARGS2%^
     --event-handler console_cohesion+ || goto :error
 ) else (
   echo "COLCON_EXTRA_CMAKE_ARGS: %COLCON_EXTRA_CMAKE_ARGS%"