From eb8a343e313967a51cb302ac9bb1206a05727d13 Mon Sep 17 00:00:00 2001 From: Bruno Cabral Date: Tue, 25 Feb 2025 22:48:59 -0800 Subject: [PATCH] [cmake] Use STATIC lib ON by default (#4799) * search raylib in custom directory * avoid loading dynamic library when both are installed * raylib_USE_STATIC_LIBS as option ON --- cmake/raylib-config.cmake | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/cmake/raylib-config.cmake b/cmake/raylib-config.cmake index 700965c95..b2ef6bfd6 100644 --- a/cmake/raylib-config.cmake +++ b/cmake/raylib-config.cmake @@ -1,6 +1,6 @@ # - Try to find raylib # Options: -# raylib_USE_STATIC_LIBS - OFF by default +# raylib_USE_STATIC_LIBS - ON by default # raylib_VERBOSE - OFF by default # Once done, this defines a raylib target that can be passed to # target_link_libraries as well as following variables: @@ -11,6 +11,9 @@ # raylib_LDFLAGS - The linker flags needed with raylib # raylib_DEFINITIONS - Compiler switches required for using raylib +option(raylib_USE_STATIC_LIBS "Use static libs" ON) +option(raylib_VERBOSE "Use static libs" OFF) + if (NOT TARGET raylib) set(XPREFIX PC_RAYLIB) @@ -25,23 +28,22 @@ if (NOT TARGET raylib) find_path(raylib_INCLUDE_DIR NAMES raylib.h - HINTS ${${XPREFIX}_INCLUDE_DIRS} + HINTS ${${XPREFIX}_INCLUDE_DIRS} ${raylib_DIR}/../../../include/ ) - set(RAYLIB_NAMES raylib) if (raylib_USE_STATIC_LIBS) - set(RAYLIB_NAMES libraylib.a raylib.lib ${RAYLIB_NAMES}) - endif() + set(RAYLIB_NAMES libraylib.a raylib.lib) + else () + set(RAYLIB_NAMES raylib) + endif () find_library(raylib_LIBRARY NAMES ${RAYLIB_NAMES} - HINTS ${${XPREFIX}_LIBRARY_DIRS} + HINTS ${${XPREFIX}_LIBRARY_DIRS} ${raylib_DIR}/../../ ) set(raylib_LIBRARIES ${raylib_LIBRARY}) - set(raylib_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS}) - set(raylib_LIBRARY_DIR ${raylib_LIBRARY_DIRS}) set(raylib_INCLUDE_DIRS ${raylib_INCLUDE_DIR}) set(raylib_LDFLAGS ${${XPREFIX}_LDFLAGS})