Fix incorrect inclusion of visual studio for unix builds

Add cmake to build requirements Fix typo Add clang c++ library to dependencies for C models linked with C++
cropsinsilico · May 24, 2024 · 478a855 · 478a855
1 parent fe8d3a8
commit 478a855
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 7 deletions.
diff --git a/recipe/meta.yaml b/recipe/meta.yaml
@@ -45,14 +45,15 @@ build:
 
 requirements:
   build:
+    - cmake  >= 3.16
     - cross-python_{{ target_platform }}     # [build_platform != target_platform]
     - hatch-fancy-pypi-readme
     - numpy >=1.13.0
     - python                                 # [build_platform != target_platform]
     - python-build
     - scikit-build-core
     - setuptools_scm
-    - vs2019_win-64
+    - vs2019_win-64                          # [win]
     - {{ compiler('c') }}
     - {{ compiler('cxx') }}
   host:

diff --git a/utils/requirements/requirements.json b/utils/requirements/requirements.json
@@ -49,6 +49,16 @@
     },
     {
       "vs2019_win-64": {
+        "os": "win",
+        "method": "conda_recipe",
+        "flags": {
+          "build": true,
+          "build_only": true
+        }
+      }
+    },
+    {
+      "cmake >= 3.16": {
         "method": "conda_recipe",
         "flags": {
           "build": true,

diff --git a/utils/requirements/requirements.yaml b/utils/requirements/requirements.yaml
@@ -26,15 +26,16 @@ general:
         build: True
         build_only: True
   - vs2019_win-64:
+      os: win
+      method: conda_recipe
+      flags:
+        build: True
+        build_only: True
+  - cmake >= 3.16:
       method: conda_recipe
       flags:
         build: True
         build_only: True
-  # - cmake >= 3.16:
-  #     method: conda_recipe
-  #     flags:
-  #       build: True
-  #       build_only: True
   - deprecation
   - flask
   - git:

diff --git a/yggdrasil/drivers/CPPModelDriver.py b/yggdrasil/drivers/CPPModelDriver.py
@@ -188,6 +188,7 @@ class ClangPPLinker(ClangLinker):
     default_executable = ClangPPCompiler.default_executable
     toolset = ClangPPCompiler.toolset
     version_regex = LDLinker.version_regex + ClangPPCompiler.version_regex
+    standard_library = ClangPPCompiler.standard_library
 
 
 class MSVCPPLinker(MSVCLinker):

diff --git a/yggdrasil/drivers/CompiledModelDriver.py b/yggdrasil/drivers/CompiledModelDriver.py
@@ -3736,7 +3736,7 @@ def _search_brute(self, fname, libtype=None, verbose=False,
             if fname_base.startswith('lib'):
                 fname_try.append(fname_base[3:])
             else:
-                fname_try.append('lib' + fname_try)
+                fname_try.append('lib' + fname_base)
         search_list = self.tool(libtype).get_search_path(
             libtype=libtype, cfg=self.cfg, **kwargs)
         for fname_base in fname_try: