ninja build

Author: duncanpo

.github/workflows/build_and_test.yml

@@ -22,8 +22,8 @@ jobs:
               with:
                 products: MATLAB_Compiler
             - name: Build OpenTelemetry-Matlab
+              working-directory: opentelemetry-matlab
               run: |
-                  cd opentelemetry-matlab
                   cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
                   cmake --build build --config Release --target install
             - name: Run tests
@@ -48,9 +48,10 @@ jobs:
               with:
                 products: MATLAB_Compiler
             - name: Build OpenTelemetry-Matlab
+              working-directory: opentelemetry-matlab
               run: |
-                  cd opentelemetry-matlab
-                  cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
+                  call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
+                  cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
                   cmake --build build --config Release --target install
             - name: Run tests
               env:
@@ -76,8 +77,8 @@ jobs:
               with:
                 products: MATLAB_Compiler
             - name: Build OpenTelemetry-Matlab
+              working-directory: opentelemetry-matlab
               run: |
-                  cd opentelemetry-matlab
                   cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release -DWITH_EXAMPLES=ON -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
                   cmake --build build --config Release --target install
             - name: Run tests

CMakeLists.txt

@@ -124,14 +124,17 @@ FetchContent_MakeAvailable(
 
 # Determine OTEL_CPP_PREFIX
 if(DEFINED OTEL_CPP_INSTALLED_DIR)
-   # OTEL_CPP_INSTALLED_DIR should point to an installed location of OpenTelemetry-cpp 
+   # Set OTEL_CPP_INSTALLED_DIR to use a pre-installed OpenTelemetry-cpp
+   # It should point to the installed location
    string(REPLACE "\\" "/" OTEL_CPP_PREFIX ${OTEL_CPP_INSTALLED_DIR})
+elseif(DEFINED OTEL_CPP_PREFIX)
+   # Set OTEL_CPP_PREFIX to specify an install location of the automatically 
+   # downloaded and built OpenTelemetry-cpp, instead of using the default 
+   # location with the build directory. This can preserve the OpenTelemetry-cpp
+   # install even if the build directory is removed.
+     string(REPLACE "\\" "/" OTEL_CPP_PREFIX ${OTEL_CPP_PREFIX})
 else()
-   if(DEFINED OTEL_CPP_PREFIX)
-       string(REPLACE "\\" "/" OTEL_CPP_PREFIX ${OTEL_CPP_PREFIX})
-   else()
-       set(OTEL_CPP_PREFIX ${CMAKE_BINARY_DIR}/otel-cpp)
-   endif()
+     set(OTEL_CPP_PREFIX ${CMAKE_BINARY_DIR}/otel-cpp)
 endif()
 
 if(WIN32)