From eb6f8bd0baa3621e27c64a864f3e9871883f515f Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Mon, 9 Mar 2020 08:29:47 +0100 Subject: [PATCH] Revert "Always use latest raylib version for cmake (#1123)" (#1126) We didn't use the latest version, but a compatible version, which is established by raylib-config-version.cmake. It's ok to have a minimal version, so revert b7c0d5b6ddfb8fd958803db837e1839ea54f6d37. --- examples/CMakeLists.txt | 2 +- games/CMakeLists.txt | 4 ++-- games/drturtle/CMakeLists.txt | 2 +- games/just_do/CMakeLists.txt | 2 +- games/koala_seasons/CMakeLists.txt | 2 +- games/light_my_ritual/CMakeLists.txt | 2 +- games/skully_escape/CMakeLists.txt | 2 +- games/wave_collector/CMakeLists.txt | 2 +- projects/CMake/CMakeLists.txt | 2 +- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index 13c4b162..2879320c 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -96,7 +96,7 @@ endif() include_directories(BEFORE SYSTEM others/external/include) if (NOT TARGET raylib) - find_package(raylib REQUIRED) + find_package(raylib 2.0 REQUIRED) endif() # Do each example diff --git a/games/CMakeLists.txt b/games/CMakeLists.txt index 93d55c2c..90a5ed08 100644 --- a/games/CMakeLists.txt +++ b/games/CMakeLists.txt @@ -1,7 +1,7 @@ # Setup the project and settings project(games) -# Get the source together +# Get the source toegher file(GLOB sources *.c) set(OUTPUT_EXT) @@ -18,7 +18,7 @@ if(${PLATFORM} MATCHES "Web") endif() if (NOT TARGET raylib) - find_package(raylib REQUIRED) + find_package(raylib 2.0 REQUIRED) endif() # Do each game diff --git a/games/drturtle/CMakeLists.txt b/games/drturtle/CMakeLists.txt index 7c98937d..f5778d9c 100644 --- a/games/drturtle/CMakeLists.txt +++ b/games/drturtle/CMakeLists.txt @@ -4,7 +4,7 @@ project(drturtle) # Executable & linking add_executable(${PROJECT_NAME} 06_drturtle_final.c) if (NOT TARGET raylib) - find_package(raylib REQUIRED) + find_package(raylib 2.0 REQUIRED) endif() target_link_libraries(${PROJECT_NAME} raylib) diff --git a/games/just_do/CMakeLists.txt b/games/just_do/CMakeLists.txt index f6cefddf..f25b6e37 100644 --- a/games/just_do/CMakeLists.txt +++ b/games/just_do/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB screen_sources "screens/*.c") # Executable & linking add_executable(${PROJECT_NAME} ${PROJECT_NAME}.c ${screen_sources}) if (NOT TARGET raylib) - find_package(raylib REQUIRED) + find_package(raylib 2.0 REQUIRED) endif() target_link_libraries(${PROJECT_NAME} raylib) diff --git a/games/koala_seasons/CMakeLists.txt b/games/koala_seasons/CMakeLists.txt index d60ffbdd..7e500d1e 100644 --- a/games/koala_seasons/CMakeLists.txt +++ b/games/koala_seasons/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB screen_sources "screens/*.c") # Executable & linking add_executable(${PROJECT_NAME} ${PROJECT_NAME}.c ${screen_sources}) if (NOT TARGET raylib) - find_package(raylib REQUIRED) + find_package(raylib 2.0 REQUIRED) endif() target_link_libraries(${PROJECT_NAME} raylib) diff --git a/games/light_my_ritual/CMakeLists.txt b/games/light_my_ritual/CMakeLists.txt index 3b1b4f65..a35a34e0 100644 --- a/games/light_my_ritual/CMakeLists.txt +++ b/games/light_my_ritual/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB screen_sources "screens/*.c") # Executable & linking add_executable(${PROJECT_NAME} ${PROJECT_NAME}.c ${screen_sources}) if (NOT TARGET raylib) - find_package(raylib REQUIRED) + find_package(raylib 2.0 REQUIRED) endif() target_link_libraries(${PROJECT_NAME} raylib) diff --git a/games/skully_escape/CMakeLists.txt b/games/skully_escape/CMakeLists.txt index fcffdb75..51047ca1 100644 --- a/games/skully_escape/CMakeLists.txt +++ b/games/skully_escape/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB screen_sources "screens/*.c") # Executable & linking add_executable(${PROJECT_NAME} skully_escape.c player.c monster.c ${screen_sources}) if (NOT TARGET raylib) - find_package(raylib REQUIRED) + find_package(raylib 2.0 REQUIRED) endif() target_link_libraries(${PROJECT_NAME} raylib) diff --git a/games/wave_collector/CMakeLists.txt b/games/wave_collector/CMakeLists.txt index 633dc0f5..a87dbeda 100644 --- a/games/wave_collector/CMakeLists.txt +++ b/games/wave_collector/CMakeLists.txt @@ -7,7 +7,7 @@ file(GLOB screen_sources "screens/*.c") # Executable & linking add_executable(${PROJECT_NAME} ${PROJECT_NAME}.c ${screen_sources}) if (NOT TARGET raylib) - find_package(raylib REQUIRED) + find_package(raylib 2.0 REQUIRED) endif() target_link_libraries(${PROJECT_NAME} raylib) diff --git a/projects/CMake/CMakeLists.txt b/projects/CMake/CMakeLists.txt index 8b407d32..ef0d3c1b 100644 --- a/projects/CMake/CMakeLists.txt +++ b/projects/CMake/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 3.11) # FetchContent is available in 3.11+ project(example) # Set this to the minimal version you want to support -find_package(raylib QUIET) # Let CMake search for a raylib-config.cmake +find_package(raylib 2.5 QUIET) # Let CMake search for a raylib-config.cmake # You could change the QUIET above to REQUIRED and remove this if() clause # This part downloads raylib and builds it if it's not installed on your system