From 65a82bfe54c161e7ce085934da3ffb27b1a224aa Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sat, 6 Nov 2021 10:00:29 -0400 Subject: [PATCH] Update project for CMake (#167) --- projects/CMake/CMakeLists.txt | 13 +++++++++---- projects/CMake/cmake/FindRaylib.cmake | 4 ++-- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 43ae365..1870232 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -4,7 +4,12 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) project(raygui C) # Config options -option(BUILD_RAYGUI_EXAMPLES "Build the examples." ON) +option(BUILD_RAYGUI_EXAMPLES "Build the examples." OFF) + +# Force building examples if building in the root as standalone. +if(CMAKE_SOURCE_DIR STREQUAL CMAKE_CURRENT_SOURCE_DIR) + set(BUILD_RAYGUI_EXAMPLES TRUE) +endif() # Directory Variables set(RAYGUI_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../..) @@ -26,14 +31,14 @@ if(${BUILD_RAYGUI_EXAMPLES}) # Get the sources together set(example_dirs + controls_test_suite custom_file_dialog + image_exporter image_raw_importer portable_window + property_list scroll_panel text_box_selection - controls_test_suite - image_exporter - property_list text_editor ) diff --git a/projects/CMake/cmake/FindRaylib.cmake b/projects/CMake/cmake/FindRaylib.cmake index 51ca6c5..93120d9 100644 --- a/projects/CMake/cmake/FindRaylib.cmake +++ b/projects/CMake/cmake/FindRaylib.cmake @@ -1,10 +1,10 @@ -find_package(raylib 3.0.0 QUIET CONFIG) +find_package(raylib 4.0.0 QUIET CONFIG) if (NOT raylib_FOUND) include(FetchContent) FetchContent_Declare( raylib GIT_REPOSITORY https://github.com/raysan5/raylib.git - GIT_TAG df5c522049ddd82fba048a6bd069338999729d6a + GIT_TAG 0851960397f02a477d80eda2239f90fae14dec64 ) FetchContent_GetProperties(raylib) if (NOT raylib_POPULATED) # Have we downloaded raylib yet?