define default cmake args as envvars (#98)

rapidsai · Jul 18, 2023 · 2dad4ca · 2dad4ca
1 parent 20bd2c0
commit 2dad4ca
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 11 deletions.
diff --git a/features/src/rapids-build-utils/.bashrc b/features/src/rapids-build-utils/.bashrc
@@ -1,4 +1,10 @@
-export CONDA_ALWAYS_YES=true;
+export CONDA_ALWAYS_YES="true";
+export CC="${CC:-"$(which gcc)"}";
+export CXX="${CXX:-"$(which g++)"}";
+export CUDAARCHS="${CUDAARCHS:-native}";
+export CUDAHOSTCXX="${CUDAHOSTCXX:-"${CXX}"}";
+export CMAKE_BUILD_TYPE="${CMAKE_BUILD_TYPE:-Release}";
+export CMAKE_EXPORT_COMPILE_COMMANDS="${CMAKE_EXPORT_COMPILE_COMMANDS:-ON}";
 
 if [[ "${PYTHON_PACKAGE_MANAGER:-}" == "pip" ]]; then
     if  [ -n "${DEFAULT_VIRTUAL_ENV:-}" ] \

diff --git a/features/src/rapids-build-utils/devcontainer-feature.json b/features/src/rapids-build-utils/devcontainer-feature.json
@@ -1,7 +1,7 @@
 {
   "name": "NVIDIA RAPIDS devcontainer build utilities",
   "id": "rapids-build-utils",
-  "version": "23.8.3",
+  "version": "23.8.4",
   "description": "A feature to install the RAPIDS devcontainer build utilities",
   "containerEnv": {
     "BASH_ENV": "/etc/bash.bash_env"

diff --git a/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh b/features/src/rapids-build-utils/opt/rapids-build-utils/bin/parse-cmake-args.sh
@@ -5,15 +5,8 @@ parse_cmake_args() {
     set -euo pipefail;
 
     local ARG="";
-    local args=(${CMAKE_ARGS:-});
-    args+=(-GNinja);
-    args+=(-DCMAKE_BUILD_TYPE=Release);
-    args+=(-DCMAKE_EXPORT_COMPILE_COMMANDS=ON);
-    args+=(-DCMAKE_CUDA_ARCHITECTURES=${CUDAARCHS:-native});
-    args+=(-DCMAKE_C_COMPILER="$(realpath -m "$(which gcc)")");
-    args+=(-DCMAKE_CXX_COMPILER="$(realpath -m "$(which g++)")");
-    args+=(-DCMAKE_CUDA_COMPILER="$(realpath -m "$(which nvcc)")");
-    args+=(-DCMAKE_CUDA_HOST_COMPILER="$(realpath -m "$(which gcc)")");
+    local args=(-GNinja);
+    args+=(${CMAKE_ARGS:-});
 
     while test -n "${1:-}"; do
         ARG="${1:-}";