From 17f0db2bd13ab8149bbbfcd2d8333471091ba65d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Fri, 21 May 2021 17:25:17 +0200 Subject: [PATCH] fix CMakeLists.txt --- CMakeLists.txt | 3 +-- lib/Ray/CMakeLists.txt | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0485dd55..8960730e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6,7 +6,6 @@ set(CMAKE_CXX_STANDARD 20) include_directories(bomberman lib/Ray/sources) include_directories(bomberman lib/wal/sources) -set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/lib/raylib) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/wal) add_subdirectory(${PROJECT_SOURCE_DIR}/lib/Ray) @@ -14,4 +13,4 @@ add_executable(bomberman sources/main.cpp ) -target_link_libraries(bomberman wal ray) +target_link_libraries(bomberman wal ray) \ No newline at end of file diff --git a/lib/Ray/CMakeLists.txt b/lib/Ray/CMakeLists.txt index acdb612f..249c934e 100644 --- a/lib/Ray/CMakeLists.txt +++ b/lib/Ray/CMakeLists.txt @@ -89,6 +89,11 @@ set(SRC sources/Window.cpp ) -find_package(raylib REQUIRED) +find_package(raylib QUIET) +if (NOT raylib_FOUND) + set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/../raylib) + find_package(raylib REQUIRED) +endif() + add_library(${LIB_NAME} STATIC ${SRC} ${HEADERS}) target_link_libraries(${LIB_NAME} raylib)