From 61181f2c49b823f691b42c6de63a5f9f130e18d6 Mon Sep 17 00:00:00 2001
From: myd7349 <myd7349@gmail.com>
Date: Fri, 5 Apr 2019 10:56:47 +0800
Subject: Fix CMake support on Win32

---
 cmake/raylib-config.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'cmake')

diff --git a/cmake/raylib-config.cmake b/cmake/raylib-config.cmake
index e2e5e9ae..76cc9048 100644
--- a/cmake/raylib-config.cmake
+++ b/cmake/raylib-config.cmake
@@ -16,8 +16,8 @@ if (raylib_USE_STATIC_LIBS)
     set(XPREFIX ${XPREFIX}_STATIC)
 endif()
 
-find_package(PkgConfig)
-pkg_check_modules(${XPREFIX} REQUIRED raylib)
+find_package(PkgConfig QUIET)
+pkg_check_modules(${XPREFIX} QUIET raylib)
 set(raylib_DEFINITIONS ${${XPREFIX}_CFLAGS})
 
 find_path(raylib_INCLUDE_DIR
@@ -26,7 +26,7 @@ find_path(raylib_INCLUDE_DIR
 )
 
 find_library(raylib_LIBRARY
-    NAMES raylib
+    NAMES raylib raylib_static
     HINTS ${${XPREFIX}_LIBRARY_DIRS}
 )
 
-- 
cgit v1.2.3


From 5134a3b61de5ac71aececd96def8f72135d3dabd Mon Sep 17 00:00:00 2001
From: myd7349 <myd7349@gmail.com>
Date: Mon, 8 Apr 2019 17:38:18 +0800
Subject: Take care of raylib_USE_STATIC_LIBS when calling find_library

---
 cmake/raylib-config.cmake | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'cmake')

diff --git a/cmake/raylib-config.cmake b/cmake/raylib-config.cmake
index 76cc9048..5ad55b16 100644
--- a/cmake/raylib-config.cmake
+++ b/cmake/raylib-config.cmake
@@ -25,10 +25,17 @@ find_path(raylib_INCLUDE_DIR
     HINTS ${${XPREFIX}_INCLUDE_DIRS}
 )
 
-find_library(raylib_LIBRARY
-    NAMES raylib raylib_static
-    HINTS ${${XPREFIX}_LIBRARY_DIRS}
-)
+if (raylib_USE_STATIC_LIBS)
+    find_library(raylib_LIBRARY
+        NAMES raylib_static
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+else ()
+    find_library(raylib_LIBRARY
+        NAMES raylib
+        HINTS ${${XPREFIX}_LIBRARY_DIRS}
+    )
+endif ()
 
 set(raylib_LIBRARIES    ${raylib_LIBRARY})
 set(raylib_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS})
-- 
cgit v1.2.3