Merge pull request #102 from mathworks/ninja

Enable Ninja build on Windows

Author: duncanpo

.github/workflows/build_and_test.yml

@@ -43,14 +43,18 @@ jobs:
               uses: actions/checkout@v3
               with: 
                 path: opentelemetry-matlab
+            - name: Install ninja-build
+              run: choco install ninja
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
                 products: MATLAB_Compiler
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
+              shell: cmd
               run: |
-                  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_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
                   cmake --build build --config Release --target install
             - name: Run tests
               env:

.github/workflows/publish_mltbx.yml

@@ -43,14 +43,18 @@ jobs:
               uses: actions/checkout@v3
               with: 
                 path: opentelemetry-matlab
+            - name: Install ninja-build
+              run: choco install ninja
             - name: Install MATLAB
               uses: matlab-actions/setup-matlab@v2
               with:
                 products: MATLAB_Compiler
             - name: Build OpenTelemetry-Matlab
               working-directory: opentelemetry-matlab
+              shell: cmd
               run: |
-                  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_CXX_COMPILER="cl.exe" -DCMAKE_C_COMPILER="cl.exe" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=${{ env.OPENTELEMETRY_MATLAB_INSTALL }}
                   cmake --build build --config Release --target install
             - name: Compress into single artifact
               working-directory: ${{ github.workspace }}

CMakeLists.txt

@@ -186,7 +186,7 @@ if(NOT DEFINED OTEL_CPP_INSTALLED_DIR)
        PREFIX ${OTEL_CPP_PREFIX}
        UPDATE_DISCONNECTED 1
        PATCH_COMMAND ${patch_command}
-       CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DWITH_OTLP_HTTP=${WITH_OTLP_HTTP} -DWITH_OTLP_GRPC=${WITH_OTLP_GRPC} -DBUILD_TESTING=OFF -DWITH_BENCHMARK=OFF -DOPENTELEMETRY_INSTALL=ON -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_CXX_STANDARD=${OTEL_CPP_CXX_STANDARD} -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR}
+       CMAKE_ARGS -DCMAKE_POSITION_INDEPENDENT_CODE=ON -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER} -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DWITH_OTLP_HTTP=${WITH_OTLP_HTTP} -DWITH_OTLP_GRPC=${WITH_OTLP_GRPC} -DBUILD_TESTING=OFF -DWITH_BENCHMARK=OFF -DOPENTELEMETRY_INSTALL=ON -DCMAKE_TOOLCHAIN_FILE=${CMAKE_TOOLCHAIN_FILE} -DCMAKE_CXX_STANDARD=${OTEL_CPP_CXX_STANDARD} -DVCPKG_INSTALLED_DIR=${VCPKG_INSTALLED_DIR}
        BUILD_BYPRODUCTS ${OTEL_CPP_LIBRARIES}
        INSTALL_DIR ${OTEL_CPP_PREFIX}
        INSTALL_COMMAND ${CMAKE_COMMAND} --install . --prefix ${OTEL_CPP_PREFIX}

vcpkg.json

@@ -7,7 +7,23 @@
     "nlohmann-json"
   ],
   "features": {
-    "otlp-http": {"description": "Otlp HTTP Exporter", "dependencies": ["curl"]},
-    "otlp-grpc": {"description": "Otlp gRPC Exporter", "dependencies": ["grpc", "abseil", "c-ares", "re2", "openssl", "upb"]}
-  }
+    "otlp-http": {
+      "description": "Otlp HTTP Exporter",
+      "dependencies": [
+        "curl"
+      ]
+    },
+    "otlp-grpc": {
+      "description": "Otlp gRPC Exporter",
+      "dependencies": [
+        "grpc",
+        "abseil",
+        "c-ares",
+        "re2",
+        "openssl",
+        "upb"
+      ]
+    }
+  },
+  "builtin-baseline": "638b1588be3a265a9c7ad5b212cef72a1cad336a"
 }