#102 Try just setting default_options.shared = False

open-simulation-platform · Feb 29, 2024 · 8ce6c07 · 8ce6c07
1 parent 316cdf4
commit 8ce6c07
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/.github/workflows/ci-conan.yml b/.github/workflows/ci-conan.yml
@@ -13,7 +13,6 @@ jobs:
         build_type: [Debug, Release]
         compiler_version: [9]
         option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False']
-        option_shared: ['shared=True', 'shared=False']
 
     steps:
       - uses: actions/checkout@v4
@@ -32,7 +31,7 @@ jobs:
           set -eu
           conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
           cd /mnt/source
-          conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" -o "libcosim/*:${{ matrix.option_shared }}" -o "${{ matrix.option_shared }}" --build=missing
+          conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" --build=missing
           cmake -S . -B build/${{ matrix.build_type }} -DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake -DCMAKE_POLICY_DEFAULT_CMP0091=NEW -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
           cmake --build build/${{ matrix.build_type }}
           cmake --build build/${{ matrix.build_type }} --target install
@@ -48,7 +47,7 @@ jobs:
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.compiler_version }}-${{ matrix.option_proxyfmu }}-${{ matrix.option_shared }}
+          name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.compiler_version }}-${{ matrix.option_proxyfmu }}
           path: build/${{ matrix.build_type }}/dist
 
   windows:
@@ -60,7 +59,6 @@ jobs:
         os: [windows-2019]
         build_type: [Debug, Release]
         option_proxyfmu: ['proxyfmu=True', 'proxyfmu=False']
-        option_shared: ['shared=True', 'shared=False']
 
     steps:
       - uses: actions/checkout@v4
@@ -74,12 +72,12 @@ jobs:
           conan remote add osp https://osp.jfrog.io/artifactory/api/conan/conan-local --force
       - name: Build
         run: |
-          conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" -o "libcosim/*:${{ matrix.option_shared }}" -o "${{ matrix.option_shared }}" --build=missing
+          conan install . -s build_type=${{ matrix.build_type }} -o "libcosim/*:${{ matrix.option_proxyfmu }}" --build=missing
           cmake -S . -B build "-DCMAKE_TOOLCHAIN_FILE=generators/conan_toolchain.cmake" -DCMAKE_POLICY_DEFAULT_CMP0091=NEW
           cmake --build build --config ${{ matrix.build_type }}
           cmake --build build --config ${{ matrix.build_type }} --target install
       - name: Upload artifact
         uses: actions/upload-artifact@v3
         with:
-          name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.option_proxyfmu }}-${{ matrix.option_shared }}
+          name: cosim-${{ runner.os }}-${{ matrix.build_type }}-${{ matrix.option_proxyfmu }}
           path: build/dist
diff --git a/conanfile.py b/conanfile.py
@@ -7,7 +7,7 @@
 
 class CosimCLIConan(ConanFile):
     settings = "os", "compiler", "build_type", "arch"
-    default_options = { "*:shared": True }
+    default_options = { "*:shared": False }
 
     def requirements(self):
         self.tool_requires("cmake/[>=3.19]")