Skip to content

Commit 78487f7

Browse files
committed
CMake: Make the raylib project as a whole embeddable
So user code can use add_subdirectory to build it (similar to what we do with GLFW or what the projects/CMake/CMakeLists.txt can do).
1 parent e82505b commit 78487f7

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

projects/CMake/CMakeLists.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ if (NOT raylib_FOUND) # If there's none, fetch and build raylib
1818
set(FETCHCONTENT_QUIET NO)
1919
FetchContent_Populate(raylib)
2020

21-
set(BUILD_EXAMPLES OFF) # don't build the supplied examples
22-
set(BUILD_GAMES OFF) # or games
21+
set(BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) # don't build the supplied examples
22+
set(BUILD_GAMES OFF CACHE BOOL "" FORCE) # or games
2323

2424
# build raylib
2525
add_subdirectory(${raylib_SOURCE_DIR} ${raylib_BINARY_DIR})

src/CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ if(STATIC)
179179
ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
180180
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
181181
)
182-
set_target_properties(raylib_static PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/release")
182+
set_target_properties(raylib_static PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}")
183183

184184
add_test("pkg-config--static" ${PROJECT_SOURCE_DIR}/../cmake/test-pkgconfig.sh --static)
185185
endif(STATIC)
@@ -229,7 +229,7 @@ if(SHARED)
229229
PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
230230
)
231231
endif()
232-
set_target_properties(raylib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_BINARY_DIR}/release")
232+
set_target_properties(raylib PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${CMAKE_CURRENT_BINARY_DIR}")
233233

234234
add_test("pkg-config" ${PROJECT_SOURCE_DIR}/../cmake/test-pkgconfig.sh)
235235
else(SHARED)
@@ -240,9 +240,9 @@ if (NOT DEFINED PKG_CONFIG_LIBS_EXTRA)
240240
set(PKG_CONFIG_LIBS_EXTRA "${PKG_CONFIG_LIBS_PRIVATE}")
241241
endif()
242242
configure_file(../raylib.pc.in raylib.pc @ONLY)
243-
install(FILES ${CMAKE_BINARY_DIR}/release/raylib.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
243+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/raylib.pc DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig")
244244
configure_file(../cmake/raylib-config-version.cmake raylib-config-version.cmake @ONLY)
245-
install(FILES ${CMAKE_BINARY_DIR}/release/raylib-config-version.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/raylib")
245+
install(FILES ${CMAKE_CURRENT_BINARY_DIR}/raylib-config-version.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/raylib")
246246
install(FILES ${PROJECT_SOURCE_DIR}/../cmake/raylib-config.cmake DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/raylib")
247247

248248
# populates raylib_{FOUND, INCLUDE_DIRS, LIBRARIES, LDFLAGS, DEFINITIONS}

0 commit comments

Comments
 (0)