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

---
 CMakeLists.txt            | 2 +-
 cmake/raylib-config.cmake | 6 +++---
 src/CMakeLists.txt        | 9 ++++++++-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index aebd4c4be..be74c4da2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ if (ENABLE_MSAN AND ENABLE_ASAN)
     MESSAGE(WARNING "Compiling with both AddressSanitizer and MemorySanitizer is not recommended")
 endif()
 
-add_subdirectory(src release)
+add_subdirectory(src)
 
 if (${BUILD_EXAMPLES})
   add_subdirectory(examples)
diff --git a/cmake/raylib-config.cmake b/cmake/raylib-config.cmake
index e2e5e9aed..76cc90487 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}
 )
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c65a4996f..c24853a1d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -188,6 +188,11 @@ if(SHARED)
       PUBLIC ${GRAPHICS}
   )
 
+  target_compile_definitions(raylib
+      PRIVATE $<BUILD_INTERFACE:BUILD_LIBTYPE_SHARED>
+      INTERFACE $<INSTALL_INTERFACE:USE_LIBTYPE_SHARED>
+  )
+
   set(PKG_CONFIG_LIBS_EXTRA "")
 
   set_property(TARGET raylib PROPERTY POSITION_INDEPENDENT_CODE ON)
@@ -214,7 +219,9 @@ if(SHARED)
   if (WIN32)
     install(
       TARGETS raylib
-      RUNTIME DESTINATION "lib"
+      ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+      RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
       PUBLIC_HEADER DESTINATION "include"
     )
   else()

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

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

diff --git a/cmake/raylib-config.cmake b/cmake/raylib-config.cmake
index 76cc90487..5ad55b169 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})

From 148eefb9bb67a4b72bb90ea9a740db3cc3c081d3 Mon Sep 17 00:00:00 2001
From: myd7349 <myd7349@gmail.com>
Date: Tue, 9 Apr 2019 20:41:40 +0800
Subject: [PATCH 3/3] Resolve CI failure with MinGW

---
 src/CMakeLists.txt | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index c24853a1d..7b69e0f9a 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -188,10 +188,12 @@ if(SHARED)
       PUBLIC ${GRAPHICS}
   )
 
-  target_compile_definitions(raylib
+  if(MSVC)
+    target_compile_definitions(raylib
       PRIVATE $<BUILD_INTERFACE:BUILD_LIBTYPE_SHARED>
       INTERFACE $<INSTALL_INTERFACE:USE_LIBTYPE_SHARED>
-  )
+    )
+  endif()
 
   set(PKG_CONFIG_LIBS_EXTRA "")