From 05dfbf3cd42e63f56d978cafec63f22fd7538e9f Mon Sep 17 00:00:00 2001
From: hristo <capitane71@gmail.com>
Date: Fri, 22 Jan 2021 01:07:22 +0200
Subject: Remove STATIC and SHARED variables. (#1542)

As described in the official documentation https://cmake.org/cmake/help/v3.0/variable/BUILD_SHARED_LIBS.html this flag is global by default and controls if the library will be built as a shared or a static library allowing us to define only one call to the add_library function (without specifying its type). It is also added as an option to be visible in CMake GUI applications.
---
 cmake/BuildOptions.cmake          | 21 ---------------------
 cmake/GlfwImport.cmake            |  7 ++++++-
 cmake/InstallConfigurations.cmake |  4 ++--
 3 files changed, 8 insertions(+), 24 deletions(-)

(limited to 'cmake')

diff --git a/cmake/BuildOptions.cmake b/cmake/BuildOptions.cmake
index 00586c23..0fce6429 100644
--- a/cmake/BuildOptions.cmake
+++ b/cmake/BuildOptions.cmake
@@ -1,24 +1,3 @@
-if(NOT (STATIC OR SHARED))
-  message(FATAL_ERROR "Nothing to do if both -DSHARED=OFF and -DSTATIC=OFF...")
-endif()
-
-if (DEFINED BUILD_SHARED_LIBS)
-  set(SHARED ${BUILD_SHARED_LIBS})
-  if (${BUILD_SHARED_LIBS})
-    set(STATIC OFF)
-  else()
-    set(STATIC ON)
-  endif()
-endif()
-if(DEFINED SHARED_RAYLIB)
-  set(SHARED ${SHARED_RAYLIB})
-  message(DEPRECATION "-DSHARED_RAYLIB is deprecated. Please use -DSHARED instead.")
-endif()
-if(DEFINED STATIC_RAYLIB)
-  set(STATIC ${STATIC_RAYLIB})
-  message(DEPRECATION "-DSTATIC_RAYLIB is deprecated. Please use -DSTATIC instead.")
-endif()
-
 if(${PLATFORM} MATCHES "Desktop" AND APPLE)
   if(MACOS_FATLIB)
       if (CMAKE_OSX_ARCHITECTURES)
diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake
index 12dbfeb9..5692e44f 100644
--- a/cmake/GlfwImport.cmake
+++ b/cmake/GlfwImport.cmake
@@ -16,10 +16,15 @@ if(NOT glfw3_FOUND AND NOT USE_EXTERNAL_GLFW STREQUAL "ON" AND "${PLATFORM}" MAT
     set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
     set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
     set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
-    set(BUILD_SHARED_LIBS OFF CACHE BOOL " " FORCE)
     set(GLFW_USE_WAYLAND ${USE_WAYLAND} CACHE BOOL "" FORCE)
     
+    set(WAS_SHARED ${BUILD_SHARED_LIBS})
+    set(BUILD_SHARED_LIBS OFF CACHE BOOL " " FORCE)
+
     add_subdirectory(external/glfw)
+
+    set(BUILD_SHARED_LIBS WAS_SHARED CACHE BOOL " " FORCE)
+    unset(WAS_SHARED)
     
     list(APPEND raylib_sources $<TARGET_OBJECTS:glfw_objlib>)
     include_directories(BEFORE SYSTEM external/glfw/include)
diff --git a/cmake/InstallConfigurations.cmake b/cmake/InstallConfigurations.cmake
index a26fedf5..6a89ad55 100644
--- a/cmake/InstallConfigurations.cmake
+++ b/cmake/InstallConfigurations.cmake
@@ -7,12 +7,12 @@ install(
 )
 
 # PKG_CONFIG_LIBS_PRIVATE is used in raylib.pc.in
-if (STATIC)
+if (NOT BUILD_SHARED_LIBS)
     include(LibraryPathToLinkerFlags)
     library_path_to_linker_flags(__PKG_CONFIG_LIBS_PRIVATE "${LIBS_PRIVATE}")
     set(PKG_CONFIG_LIBS_PRIVATE ${__PKG_CONFIG_LIBS_PRIVATE} ${GLFW_PKG_LIBS})
     string(REPLACE ";" " " PKG_CONFIG_LIBS_PRIVATE "${PKG_CONFIG_LIBS_PRIVATE}")
-elseif (SHARED)
+elseif (BUILD_SHARED_LIBS)
     set(PKG_CONFIG_LIBS_EXTRA "")
 endif ()
 
-- 
cgit v1.2.3