Make `dependency('foo', static: true, method: 'cmake') link statically

Fixes #1709
mesonbuild · May 13, 2023 · a8b144b · a8b144b
1 parent 2699fd4
commit a8b144b
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/mesonbuild/dependencies/cmake.py b/mesonbuild/dependencies/cmake.py
@@ -388,6 +388,7 @@ def _detect_dep(self, name: str, package_version: str, modules: T.List[T.Tuple[s
             cmake_opts += ['-DARCHS={}'.format(';'.join(self.cmakeinfo.archs))]
             cmake_opts += [f'-DVERSION={package_version}']
             cmake_opts += ['-DCOMPS={}'.format(';'.join([x[0] for x in comp_mapped]))]
+            cmake_opts += [f'-DSTATIC={self.static}']
             cmake_opts += args
             cmake_opts += self.traceparser.trace_args()
             cmake_opts += toolchain.get_cmake_args()

diff --git a/mesonbuild/dependencies/data/CMakeLists.txt b/mesonbuild/dependencies/data/CMakeLists.txt
@@ -8,6 +8,10 @@ set(PACKAGE_FOUND FALSE)
 set(_packageName "${NAME}")
 string(TOUPPER "${_packageName}" PACKAGE_NAME)
 
+if("${STATIC}" STREQUAL "True")
+  set("${NAME}_USE_STATIC_LIBS" "ON")
+endif()
+
 while(TRUE)
   if ("${VERSION}" STREQUAL "")
     find_package("${NAME}" QUIET COMPONENTS ${COMPS})

diff --git a/test cases/rust/13 external c dependencies/test.json b/test cases/rust/13 external c dependencies/test.json
@@ -12,7 +12,8 @@
       ]
     },
     "exclude": [
-      { "static": true, "method": "pkg-config" }
+      { "static": true, "method": "pkg-config" },
+      { "static": true, "method": "cmake" }
     ]
   }
 }