Modified the swig recipe (my fork of conan-center) to properly enable…

… PRCE
NREL · May 21, 2024 · 8153bff · 8153bff
1 parent 4391413
commit 8153bff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/.github/workflows/buildCSharp.yml b/.github/workflows/buildCSharp.yml
@@ -44,6 +44,7 @@ jobs:
       run: |
         rm CMakeLists.txt
         aria2c https://raw.githubusercontent.com/NREL/OpenStudio/CSharp/CMakeLists.txt
+        aria2c https://raw.githubusercontent.com/NREL/OpenStudio/CSharp/conan.lock
 
     - uses: actions/setup-python@v5
 
@@ -122,7 +123,7 @@ jobs:
           # Avoid "builtin __has_nothrow_assign is deprecated; use __is_nothrow_assignable instead" in boost/1.79 with recent clang
           conan install . --output-folder=./build --build=missing -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.cppstd=20 -s build_type=${{ env.BUILD_TYPE }} -o 'openstudio/:*with_testing=False' -o 'openstudio/:*with_benchmark=False' -c tools.build:cxxflags="['-D_LIBCPP_ENABLE_CXX17_REMOVED_UNARY_BINARY_FUNCTION']"
         else
-          conan install . --output-folder=./build --build=missing --build='swig/*' -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.cppstd=20 -s build_type=${{ env.BUILD_TYPE }} -o 'openstudio/:*with_testing=False' -o 'openstudio/:*with_benchmark=False'
+          conan install . --output-folder=./build --build=missing -c tools.cmake.cmaketoolchain:generator=Ninja -s compiler.cppstd=20 -s build_type=${{ env.BUILD_TYPE }} -o 'openstudio/:*with_testing=False' -o 'openstudio/:*with_benchmark=False'
         fi
         echo -e "::endgroup::"
 
@@ -141,7 +142,6 @@ jobs:
       shell: cmd
       run: |
         echo "::group::Conan Install"
-        # TODO: can we replace with Ninja...?
         conan install . --output-folder=./build --build=missing -c tools.cmake.cmaketoolchain:generator="Visual Studio 17 2022" -s compiler.cppstd=20 -s build_type=${{ env.BUILD_TYPE }} -o 'openstudio/:*with_testing=False' -o 'openstudio/:*with_benchmark=False'
         echo "::engroup::"
 

diff --git a/conan.lock b/conan.lock
@@ -5,7 +5,7 @@
         "websocketpp/0.8.2#842a0419153a8aa52f3ea3a1da557d38%1695972005.713",
         "tinygltf/2.5.0#65c28d0a4c3cbd4ef92b08b59df769da%1701621757.442",
         "termcap/1.3.1#1986f84bf21dd07ea774b027a3201fcb%1678542508.75",
-        "swig/4.1.1#8f418438101ef7712d52a9fe739d32f9%1707838298.077707",
+        "swig/4.1.1#17612ff080762f2f376aa8ac47fe843e%1716328569.7343519",
         "stb/cci.20230920#9792498b81cf34a90138d239e36b0bf8%1700546289.605",
         "sqlite3/3.38.5#4b875d4249cdfb4c1235e6b3ea6c18e7%1676251415.466",
         "ruby/3.2.2#7a66613b28107b3318a6ff60701c1b6b%1707386606.655",
@@ -56,5 +56,6 @@
         "boost/1.83.0": [
             "boost/1.79.0#d8a5b9e748e4152d6f489d7d87a1f129"
         ]
-    }
+    },
+    "config_requires": []
 }