From dd8dbb72498dbcda6766117ab68cd890cbdf2c8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Thu, 13 May 2021 00:02:05 +0200 Subject: [PATCH 1/2] adding subject given cmake instructions --- CMakeLists.txt | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5255d0ed..a4b4c7cf 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,24 @@ -cmake_minimum_required(VERSION 3.19) +CMAKE_MINIMUM_REQUIRED(VERSION 3.11) project(Bomberman) +FIND_PACKAGE(raylib REQUIRED) +TARGET_LINK_LIBRARIES(target_name raylib) + +if (NOT raylib_FOUND) + INCLUDE(FetchContent) + FetchContent_Declare(raylib URL https://github.com/raysan5/raylib/archive/master.tar.gz) + FetchContent_GetProperties(raylib) + if (NOT raylib_POPULATED) + SET(FETCHCONTENT_QUIET NO) + FetchContent_Populate(raylib) + SET(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) + ADD_SUBDIRECTORY(${raylib_SOURCE_DIR} ${raylib_BINARY_DIR}) + SET(raylib_FOUND TRUE) + endif() +endif() + set(CMAKE_CXX_STANDARD 20) add_executable(bomberman sources/main.cpp -) \ No newline at end of file +) From 01395cc7bf7b80ac05e875dad038f719094e0af9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Mon, 17 May 2021 11:52:13 +0200 Subject: [PATCH 2/2] rm unwanted cmake instruction (sadly the find package instruction doesn't seems to work with raylib) --- CMakeLists.txt | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4b4c7cf..16e7c617 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,24 +1,9 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.11) project(Bomberman) - -FIND_PACKAGE(raylib REQUIRED) -TARGET_LINK_LIBRARIES(target_name raylib) - -if (NOT raylib_FOUND) - INCLUDE(FetchContent) - FetchContent_Declare(raylib URL https://github.com/raysan5/raylib/archive/master.tar.gz) - FetchContent_GetProperties(raylib) - if (NOT raylib_POPULATED) - SET(FETCHCONTENT_QUIET NO) - FetchContent_Populate(raylib) - SET(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) - ADD_SUBDIRECTORY(${raylib_SOURCE_DIR} ${raylib_BINARY_DIR}) - SET(raylib_FOUND TRUE) - endif() -endif() - set(CMAKE_CXX_STANDARD 20) add_executable(bomberman sources/main.cpp ) + +target_link_libraries(bomberman raylib) \ No newline at end of file