Added pkgconfig file for GLFW

.circleci/config.yml

@@ -439,7 +439,7 @@ jobs:
       - pip-install:
           python: "$EMSDK_PYTHON"
       - run-tests:
-          test_targets: "other.test_es5_transpile other.test_emcc_cflags other.test_stdin other.test_bad_triple core2.test_sse1 core2.test_ccall other.test_closure_externs other.test_binaryen_debug other.test_js_optimizer_parse_error other.test_output_to_nowhere other.test_emcc_dev_null other.test_cmake* other.test_system_include_paths other.test_emar_response_file core2.test_utf16 other.test_special_chars_in_arguments other.test_toolchain_profiler other.test_realpath_nodefs other.test_response_file_encoding other.test_libc_progname other.test_realpath other.test_embed_file_dup other.test_dot_a_all_contents_invalid"
+          test_targets: "other.test_es5_transpile other.test_emcc_cflags other.test_stdin other.test_bad_triple core2.test_sse1 core2.test_ccall other.test_closure_externs other.test_binaryen_debug other.test_js_optimizer_parse_error other.test_output_to_nowhere other.test_emcc_dev_null other.test_cmake* other.test_system_include_paths other.test_emar_response_file core2.test_utf16 other.test_special_chars_in_arguments other.test_toolchain_profiler other.test_realpath_nodefs other.test_response_file_encoding other.test_libc_progname other.test_realpath other.test_embed_file_dup other.test_dot_a_all_contents_invalid other.test_pkg_config*"
       # Run a single websockify-based test to ensure it works on windows.
       - run-tests:
           test_targets: "sockets.test_nodejs_sockets_echo*"

system/lib/pkgconfig/glfw3.pc

@@ -0,0 +1,4 @@
+Name: GLFW
+Description: A multi-platform library for OpenGL, window and input
+Version: 3.2.1
+Libs: -sUSE_GLFW=3

tests/cmake/find_pkg_config/CMakeLists.txt

@@ -11,4 +11,5 @@ endif()
 message(STATUS "Check that all .pc files shipped with Emscripten can be located correctly")
 pkg_check_modules(EGL REQUIRED egl)
 pkg_check_modules(GLESV2 REQUIRED glesv2)
-pkg_check_modules(SDL2 REQUIRED sdl)
+pkg_check_modules(GLFW3 REQUIRED glfw3)
+pkg_check_modules(SDL REQUIRED sdl)

tests/test_other.py

@@ -135,6 +135,18 @@ def metafunc(self, backend):
   return metafunc
 
 
+def requires_pkg_config(func):
+  assert callable(func)
+
+  @wraps(func)
+  def decorated(self, *args, **kwargs):
+    if not utils.which('pkg-config'):
+      self.fail('pkg-config is required to run this test')
+    return func(self, *args, **kwargs)
+
+  return decorated
+
+
 class other(RunnerCore):
   def assertIsObjectFile(self, filename):
     self.assertTrue(building.is_wasm(filename))
@@ -805,14 +817,25 @@ def test_cmake_find_modules(self):
     self.assertContained('AL_VERSION: 1.1', output)
     self.assertContained('SDL version: 2.0.', output)
 
+  @requires_pkg_config
   def test_cmake_find_pkg_config(self):
-    if not utils.which('pkg-config'):
-      self.fail('pkg-config is required to run this test')
     out = self.run_process([EMCMAKE, 'cmake', test_file('cmake/find_pkg_config')], stdout=PIPE).stdout
     libdir = shared.Cache.get_sysroot_dir('local', 'lib', 'pkgconfig')
     libdir += os.path.pathsep + shared.Cache.get_sysroot_dir('lib', 'pkgconfig')
     self.assertContained('PKG_CONFIG_LIBDIR: ' + libdir, out)
 
+  @requires_pkg_config
+  def test_pkg_config_packages(self):
+    packages = [
+      ('egl', '10.2.2'),
+      ('glesv2', '10.2.2'),
+      ('glfw3', '3.2.1'),
+      ('sdl', '1.2.15'),
+    ]
+    for package, version in packages:
+        out = self.run_process([emmake, 'pkg-config', '--modversion', package], stdout=PIPE).stdout
+        self.assertContained(version, out)
+
   def test_system_include_paths(self):
     # Verify that all default include paths are within `emscripten/system`