Merge branch 'raysan5:master' into pure

cmake/GlfwImport.cmake

@@ -12,20 +12,26 @@ endif()
 # Also adding only on desktop (web also uses glfw but it is more limited and is added using an emcc linker flag)
 if(NOT glfw3_FOUND AND NOT USE_EXTERNAL_GLFW STREQUAL "ON" AND "${PLATFORM}" MATCHES "Desktop")
     MESSAGE(STATUS "Using raylib's GLFW")
+    set(INTERNAL_GLFW ON CACHE INTERNAL "" FORCE)
     set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE)
     set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)
     set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
     set(GLFW_INSTALL OFF CACHE BOOL "" FORCE)
     set(GLFW_LIBRARY_TYPE "OBJECT" CACHE STRING "" FORCE)
-
+
+
+    if (NOT BUILD_SHARED_LIBS)
+        message(STATUS "Enabling install of GLFW static libs because raylib will be built statically")
+        set(GLFW_INSTALL ON CACHE BOOL "" FORCE)
+    endif ()
 
     add_subdirectory(external/glfw)
 
     # Hide glfw's symbols when building a shared lib
     if (BUILD_SHARED_LIBS)
         set_property(TARGET glfw PROPERTY C_VISIBILITY_PRESET hidden)
     endif()
-    
+
     list(APPEND raylib_sources $<TARGET_OBJECTS:glfw>)
     include_directories(BEFORE SYSTEM external/glfw/include)
 elseif("${PLATFORM}" STREQUAL "DRM")

cmake/InstallConfigurations.cmake

@@ -18,10 +18,8 @@ endif ()
 join_paths(libdir_for_pc_file "\${exec_prefix}" "${CMAKE_INSTALL_LIBDIR}")
 join_paths(includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}")
 configure_file(../raylib.pc.in raylib.pc @ONLY)
-configure_file(../cmake/raylib-config-version.cmake raylib-config-version.cmake @ONLY)
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/raylib.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/raylib-config-version.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/raylib")
-install(FILES ${PROJECT_SOURCE_DIR}/../cmake/raylib-config.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/raylib")
+include(SetupCmakeConfig)
 
 # populates raylib_{FOUND, INCLUDE_DIRS, LIBRARIES, LDFLAGS, DEFINITIONS}
 include(PopulateConfigVariablesLocally)

cmake/LibraryConfigurations.cmake

@@ -125,7 +125,3 @@ if (NOT GRAPHICS)
 endif ()
 
 set(LIBS_PRIVATE ${LIBS_PRIVATE} ${OPENAL_LIBRARY})
-
-if (${PLATFORM} MATCHES "Desktop")
-    set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw)
-endif ()

cmake/SetupCmakeConfig.cmake

@@ -0,0 +1,23 @@
+include(CMakePackageConfigHelpers)
+include(GNUInstallDirs)
+
+# Setup install of exported targets
+install(EXPORT raylib-targets
+  DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/raylib
+)
+
+# Macro to write config
+write_basic_package_version_file(
+  "${CMAKE_CURRENT_BINARY_DIR}/raylib-config-version.cmake"
+  VERSION ${raylib_VERSION}
+  COMPATIBILITY SameMajorVersion
+)
+
+# Setup install of version config
+install(
+  FILES
+    "../cmake/raylib-config.cmake"
+    "${CMAKE_CURRENT_BINARY_DIR}/raylib-config-version.cmake"
+  DESTINATION
+   ${CMAKE_INSTALL_LIBDIR}/cmake/raylib
+)

cmake/raylib-config.cmake

@@ -1,79 +1 @@
-# - Try to find raylib
-# Options:
-#   raylib_USE_STATIC_LIBS - OFF 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:
-#
-#   raylib_FOUND - System has raylib installed
-#   raylib_INCLUDE_DIRS - The include directories for the raylib header(s)
-#   raylib_LIBRARIES - The libraries needed to use raylib
-#   raylib_LDFLAGS - The linker flags needed with raylib
-#   raylib_DEFINITIONS - Compiler switches required for using raylib
-
-if (NOT TARGET raylib)
-    set(XPREFIX PC_RAYLIB)
-
-    find_package(PkgConfig QUIET)
-    pkg_check_modules(${XPREFIX} QUIET raylib)
-
-    if (raylib_USE_STATIC_LIBS)
-        set(XPREFIX ${XPREFIX}_STATIC)
-    endif()
-
-    set(raylib_DEFINITIONS ${${XPREFIX}_CFLAGS})
-
-    find_path(raylib_INCLUDE_DIR
-        NAMES raylib.h
-        HINTS ${${XPREFIX}_INCLUDE_DIRS}
-    )
-
-    set(RAYLIB_NAMES raylib)
-
-    if (raylib_USE_STATIC_LIBS)
-        set(RAYLIB_NAMES libraylib.a raylib.lib ${RAYLIB_NAMES})
-    endif()
-
-    find_library(raylib_LIBRARY
-        NAMES ${RAYLIB_NAMES}
-        HINTS ${${XPREFIX}_LIBRARY_DIRS}
-    )
-
-    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})
-
-    include(FindPackageHandleStandardArgs)
-    find_package_handle_standard_args(raylib DEFAULT_MSG
-        raylib_LIBRARY
-        raylib_INCLUDE_DIR
-    )
-
-    mark_as_advanced(raylib_LIBRARY raylib_INCLUDE_DIR)
-
-    if (raylib_USE_STATIC_LIBS)
-      add_library(raylib STATIC IMPORTED GLOBAL)
-    else()
-      add_library(raylib SHARED IMPORTED GLOBAL)
-    endif()
-    string (REPLACE ";" " " raylib_LDFLAGS "${raylib_LDFLAGS}")
-
-    set_target_properties(raylib
-      PROPERTIES
-      IMPORTED_LOCATION             "${raylib_LIBRARIES}"
-      IMPORTED_IMPLIB               "${raylib_LIBRARIES}"
-      INTERFACE_INCLUDE_DIRECTORIES "${raylib_INCLUDE_DIRS}"
-      INTERFACE_LINK_LIBRARIES      "${raylib_LDFLAGS}"
-      INTERFACE_COMPILE_OPTIONS     "${raylib_DEFINITIONS}"
-    )
-
-    if (raylib_VERBOSE)
-      message(STATUS "raylib_FOUND: ${raylib_FOUND}")
-      message(STATUS "raylib_INCLUDE_DIRS: ${raylib_INCLUDE_DIRS}")
-      message(STATUS "raylib_LIBRARIES: ${raylib_LIBRARIES}")
-      message(STATUS "raylib_LDFLAGS: ${raylib_LDFLAGS}")
-      message(STATUS "raylib_DEFINITIONS: ${raylib_DEFINITIONS}")
-    endif()
-endif()
+include("${CMAKE_CURRENT_LIST_DIR}/raylib-targets.cmake")

projects/Notepad++/raylib_npp_parser/raylib_to_parse.h

@@ -190,7 +190,7 @@ RLAPI char *EncodeDataBase64(const unsigned char *data, int dataSize, int *outpu
 RLAPI unsigned char *DecodeDataBase64(const unsigned char *data, int *outputSize);                    // Decode Base64 string data, memory must be MemFree()
 RLAPI unsigned int ComputeCRC32(unsigned char *data, int dataSize);     // Compute CRC32 hash code
 RLAPI unsigned int *ComputeMD5(unsigned char *data, int dataSize);      // Compute MD5 hash code, returns static int[4] (16 bytes)
-RLAPI unsigned int *ComputeSHA1(unsigned char *data, int dataSize);      // Compute SHA1 hash code, returns static int[5] (20 bytes)
+RLAPI unsigned int *ComputeSHA1(unsigned char *data, int dataSize);     // Compute SHA1 hash code, returns static int[5] (20 bytes)
 
 
 // Automation events functionality

src/CMakeLists.txt

@@ -90,7 +90,16 @@ if (BUILD_SHARED_LIBS)
     set_property(TARGET raylib PROPERTY C_VISIBILITY_PRESET hidden)
 endif ()
 
-target_link_libraries(raylib "${LIBS_PRIVATE}")
+
+# If building as a static lib *AND* using internal GLFW we
+# need to set it up as a PRIVATE import so cmake doesn't complain
+# it isn't declared on an install rule
+if (INTERNAL_GLFW AND BUILD_SHARED_LIBS)
+    target_link_libraries(raylib PRIVATE glfw)
+endif()
+
+target_link_libraries(raylib PUBLIC "${LIBS_PRIVATE}")
+
 
 # Sets some compile time definitions for the pre-processor
 # If CUSTOMIZE_BUILD option is on you will not use config.h by default

src/raylib.h

@@ -1152,7 +1152,7 @@ RLAPI char *EncodeDataBase64(const unsigned char *data, int dataSize, int *outpu
 RLAPI unsigned char *DecodeDataBase64(const unsigned char *data, int *outputSize);                    // Decode Base64 string data, memory must be MemFree()
 RLAPI unsigned int ComputeCRC32(unsigned char *data, int dataSize);     // Compute CRC32 hash code
 RLAPI unsigned int *ComputeMD5(unsigned char *data, int dataSize);      // Compute MD5 hash code, returns static int[4] (16 bytes)
-RLAPI unsigned int *ComputeSHA1(unsigned char *data, int dataSize);      // Compute SHA1 hash code, returns static int[5] (20 bytes)
+RLAPI unsigned int *ComputeSHA1(unsigned char *data, int dataSize);     // Compute SHA1 hash code, returns static int[5] (20 bytes)
 
 
 // Automation events functionality