Skip to content

Commit 8bded7c

Browse files
committed
cmake: Use CMake to download dependencies
1 parent abe4076 commit 8bded7c

File tree

7 files changed

+42
-30
lines changed

7 files changed

+42
-30
lines changed

.gitmodules

Lines changed: 0 additions & 7 deletions
This file was deleted.

CMakeLists.txt

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,32 @@
11
cmake_minimum_required(VERSION 3.11)
2-
project (raylib-aseprite
3-
VERSION 4.0.1
4-
DESCRIPTION "raylib-aseprite"
2+
project (raylib_aseprite
3+
VERSION 4.0.2
4+
DESCRIPTION "raylib_aseprite: Use Aseprite files in raylib"
55
HOMEPAGE_URL "https://github.com/robloach/raylib-aseprite"
66
LANGUAGES C)
77

88
# Include Directory
99
add_subdirectory(include)
1010

11+
# Options
12+
if ("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
13+
set(RAYLIB_ASEPRITE_IS_MAIN TRUE)
14+
else()
15+
set(RAYLIB_ASEPRITE_IS_MAIN FALSE)
16+
endif()
17+
option(RAYLIB_ASEPRITE_BUILD_EXAMPLES "Examples" ${RAYLIB_ASEPRITE_IS_MAIN})
18+
1119
# Examples
12-
option(RAYLIB_ASEPRITE_BUILD_EXAMPLES "Build Examples" ON)
1320
if(RAYLIB_ASEPRITE_BUILD_EXAMPLES)
1421
add_subdirectory(examples)
15-
endif()
1622

17-
# Testing
18-
include(CTest)
19-
enable_testing()
20-
if(BUILD_TESTING AND RAYLIB_ASEPRITE_BUILD_EXAMPLES)
21-
set(CTEST_CUSTOM_TESTS_IGNORE
22-
pkg-config--static
23-
)
24-
add_subdirectory(test)
23+
# Testing
24+
include(CTest)
25+
enable_testing()
26+
if(BUILD_TESTING)
27+
# set(CTEST_CUSTOM_TESTS_IGNORE
28+
# pkg-config--static
29+
# )
30+
add_subdirectory(test)
31+
endif()
2532
endif()

examples/CMakeLists.txt

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,37 @@
11
# raylib
22
find_package(raylib QUIET)
33
if (NOT raylib_FOUND)
4-
set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
5-
set(BUILD_GAMES OFF CACHE BOOL "" FORCE)
6-
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/../vendor/raylib ${CMAKE_CURRENT_SOURCE_DIR}/../vendor/raylib)
4+
include(FetchContent)
5+
FetchContent_Declare(
6+
raylib
7+
GIT_REPOSITORY https://github.com/raysan5/raylib.git
8+
GIT_TAG 4.0.0
9+
)
10+
FetchContent_GetProperties(raylib)
11+
if (NOT raylib_POPULATED) # Have we downloaded raylib yet?
12+
set(FETCHCONTENT_QUIET NO)
13+
FetchContent_Populate(raylib)
14+
set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
15+
set(BUILD_GAMES OFF CACHE BOOL "" FORCE)
16+
add_subdirectory(${raylib_SOURCE_DIR} ${raylib_BINARY_DIR})
17+
endif()
718
endif()
819

920
# raylib-aseprite-example
1021
add_executable(raylib-aseprite-example raylib-aseprite-example.c)
1122
target_link_libraries(raylib-aseprite-example PUBLIC
1223
raylib
13-
raylib-aseprite
24+
raylib_aseprite
1425
)
26+
set_property(TARGET raylib-aseprite-example PROPERTY C_STANDARD 99)
1527

1628
# raylib-aseprite-numbers
1729
add_executable(raylib-aseprite-numbers raylib-aseprite-numbers.c)
1830
target_link_libraries(raylib-aseprite-numbers PUBLIC
1931
raylib
20-
raylib-aseprite
32+
raylib_aseprite
2133
)
34+
set_property(TARGET raylib-aseprite-numbers PROPERTY C_STANDARD 99)
2235

2336
# Copy the resources
2437
file(GLOB resources resources/*)

include/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
add_library(raylib-aseprite INTERFACE)
1+
add_library(raylib_aseprite INTERFACE)
22

33
# Include Directory
4-
target_include_directories(raylib-aseprite INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/)
4+
target_include_directories(raylib_aseprite INTERFACE ${CMAKE_CURRENT_SOURCE_DIR}/)
55

66
# Set the header files as install files.
77
install(FILES

test/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,9 @@ add_executable(raylib-aseprite-test raylib-aseprite-test.c)
33
target_compile_options(raylib-aseprite-test PRIVATE -Wall -Wextra -Wconversion -Wsign-conversion)
44
target_link_libraries(raylib-aseprite-test PUBLIC
55
raylib
6-
raylib-aseprite
6+
raylib_aseprite
77
)
8+
set_property(TARGET raylib-aseprite-test PROPERTY C_STANDARD 99)
89

910
# Copy the resources
1011
file(GLOB resources resources/*)

vendor/cute_headers

Lines changed: 0 additions & 1 deletion
This file was deleted.

vendor/raylib

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)