forked from raysan5/raylib
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
CMake: Major cleanup to support find_package(raylib)
Remove that link_libraries_to_executable() hack and defines a proper raylib target that can be used with target_link_libraries. The same target is also available for external (user) code by using find_package(raylib). This results in: - Remove hardcoded build directories from examples and games CMakeLists.txt - Allow rlgl_standalone and other special examples to be built easily - Allow CMake projects to find_package(raylib instead of fiddling with pkg-config - Makes code a little more maintainable - Fixes raysan5#471, raysan5#606. - Makes code less confusing by removing the double use of PLATFORM (raysan5#584). Note that this is still not _The Right Way_(TM), because normally raylib-config.cmake (or its includes) would be automatically generated. I didn't manage to get that to work though, so I went the easier route of just wrapping pkg_check_modules for consumption by find_package.
- Loading branch information
Showing
17 changed files
with
308 additions
and
260 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| function(library_path_to_linker_flags LD_FLAGS LIB_PATHS) | ||
| foreach(L ${LIB_PATHS}) | ||
| get_filename_component(DIR ${L} PATH) | ||
| get_filename_component(LIBFILE ${L} NAME_WE) | ||
| STRING(REGEX REPLACE "^lib" "" FILE ${LIBFILE}) | ||
|
|
||
| if (${L} MATCHES "[.]framework$") | ||
| set(FILE_OPT "-framework ${FILE}") | ||
| set(DIR_OPT "-F${DIR}") | ||
| else() | ||
| set(FILE_OPT "-l${FILE}") | ||
| set(DIR_OPT "-L${DIR}") | ||
| endif() | ||
|
|
||
| if ("${DIR}" STREQUAL "" OR "${DIR}" STREQUAL "${LASTDIR}") | ||
| set (DIR_OPT "") | ||
| endif() | ||
|
|
||
| set(LASTDIR ${DIR}) | ||
|
|
||
| set(${LD_FLAGS} ${${LD_FLAGS}} ${DIR_OPT} ${FILE_OPT} PARENT_SCOPE) | ||
| string (REPLACE ";" " " ${LD_FLAGS} "${${LD_FLAGS}}") | ||
| endforeach() | ||
| endfunction() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| macro(populate_config_variables_locally target) | ||
| get_property(raylib_INCLUDE_DIRS TARGET ${target} PROPERTY INTERFACE_INCLUDE_DIRECTORIES) | ||
| #get_property(raylib_LIBRARIES TARGET ${target} PROPERTY LOCATION) # only works for SHARED | ||
| get_property(raylib_LDFLAGS TARGET ${target} PROPERTY INTERFACE_LINK_LIBRARIES) | ||
| get_property(raylib_DEFINITIONS TARGET ${target} PROPERTY DEFINITIONS) | ||
|
|
||
| set(raylib_INCLUDE_DIRS "${raylib_INCLUDE_DIRS}" PARENT_SCOPE) | ||
| #set(raylib_LIBRARIES "${raylib_INCLUDE_DIRS}" PARENT_SCOPE) | ||
| set(raylib_LDFLAGS "${raylib_LDFLAGS}" PARENT_SCOPE) | ||
| set(raylib_DEFINITIONS "${raylib_DEFINITIONS}" PARENT_SCOPE) | ||
| endmacro() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| set(PACKAGE_VERSION "@PROJECT_VERSION@") | ||
|
|
||
| if(PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION) | ||
| set(PACKAGE_VERSION_EXACT TRUE) | ||
| endif() | ||
| if(NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) | ||
| set(PACKAGE_VERSION_COMPATIBLE TRUE) | ||
| else(NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) | ||
| set(PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| endif(NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION) | ||
|
|
||
| # if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it: | ||
| if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "") | ||
| return() | ||
| endif() | ||
|
|
||
| if(NOT CMAKE_SIZEOF_VOID_P STREQUAL "@CMAKE_SIZEOF_VOID_P@") | ||
| math(EXPR installedBits "8 * 8") | ||
| set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)") | ||
| set(PACKAGE_VERSION_UNSUITABLE TRUE) | ||
| endif() |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| # - Try to find raylib | ||
| # Options: | ||
| # raylib_USE_STATIC_LIBS - OFF by default | ||
| # raylib_VERBOSE - OFF by default | ||
| # Once done, this defines a raylib target that can be passed to | ||
| # target_link_libraries as well as following variables: | ||
| # | ||
| # raylib_FOUND - System has raylib installed | ||
| # raylib_INCLUDE_DIRS - The include directories for the raylib header(s) | ||
| # raylib_LIBRARIES - The libraries needed to use raylib | ||
| # raylib_LDFLAGS - The linker flags needed with raylib | ||
| # raylib_DEFINITIONS - Compiler switches required for using raylib | ||
|
|
||
| set(XPREFIX PC_RAYLIB) | ||
| if (raylib_USE_STATIC_LIBS) | ||
| set(XPREFIX ${XPREFIX}_STATIC) | ||
| endif() | ||
|
|
||
| find_package(PkgConfig) | ||
| pkg_check_modules(${XPREFIX} REQUIRED raylib) | ||
| set(raylib_DEFINITIONS ${${XPREFIX}_CFLAGS}) | ||
|
|
||
| find_path(raylib_INCLUDE_DIR | ||
| NAMES raylib.h | ||
| HINTS ${${XPREFIX}_INCLUDE_DIRS} | ||
| ) | ||
|
|
||
| find_library(raylib_LIBRARY | ||
| NAMES raylib | ||
| HINTS ${${XPREFIX}_LIBRARY_DIRS} | ||
| ) | ||
|
|
||
| set(raylib_LIBRARIES ${raylib_LIBRARY}) | ||
| set(raylib_LIBRARY_DIRS ${${XPREFIX}_LIBRARY_DIRS}) | ||
| set(raylib_LIBRARY_DIR ${raylib_LIBRARY_DIRS}) | ||
| set(raylib_INCLUDE_DIRS ${raylib_INCLUDE_DIR}) | ||
| set(raylib_LDFLAGS ${${XPREFIX}_LDFLAGS}) | ||
|
|
||
| include(FindPackageHandleStandardArgs) | ||
| find_package_handle_standard_args(raylib DEFAULT_MSG | ||
| raylib_LIBRARY | ||
| raylib_INCLUDE_DIR | ||
| ) | ||
|
|
||
| mark_as_advanced(raylib_LIBRARY raylib_INCLUDE_DIR) | ||
|
|
||
| if (raylib_USE_STATIC_LIBS) | ||
| add_library(raylib STATIC IMPORTED GLOBAL) | ||
| else() | ||
| add_library(raylib SHARED IMPORTED GLOBAL) | ||
| endif() | ||
| string (REPLACE ";" " " raylib_LDFLAGS "${raylib_LDFLAGS}") | ||
|
|
||
| set_target_properties(raylib | ||
| PROPERTIES | ||
| IMPORTED_LOCATION "${raylib_LIBRARIES}" | ||
| INTERFACE_INCLUDE_DIRECTORIES "${raylib_INCLUDE_DIRS}" | ||
| INTERFACE_LINK_LIBRARIES "${raylib_LDFLAGS}" | ||
| INTERFACE_COMPILE_OPTIONS "${raylib_DEFINITIONS}" | ||
| ) | ||
|
|
||
| if (raylib_VERBOSE) | ||
| message(STATUS "raylib_FOUND: ${raylib_FOUND}") | ||
| message(STATUS "raylib_INCLUDE_DIRS: ${raylib_INCLUDE_DIRS}") | ||
| message(STATUS "raylib_LIBRARIES: ${raylib_LIBRARIES}") | ||
| message(STATUS "raylib_LDFLAGS: ${raylib_LDFLAGS}") | ||
| message(STATUS "raylib_DEFINITIONS: ${raylib_DEFINITIONS}") | ||
| endif() |
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,13 @@ | ||
| # Setup the project and settings | ||
| cmake_minimum_required(VERSION 2.6) | ||
| project(drturtle) | ||
|
|
||
| include("../../cmake/utils.cmake") | ||
|
|
||
|
|
||
| # Make sure raylib has been built | ||
| # TODO `build` directory should maybe be something else... | ||
| include_directories("../../build/release") | ||
|
|
||
| # Executable & linking | ||
| add_executable(drturtle 06_drturtle_final.c) | ||
| link_libraries_to_executable(drturtle) | ||
| add_executable(${PROJECT_NAME} 06_drturtle_final.c) | ||
| if (NOT TARGET raylib) | ||
| find_package(raylib 2.0 REQUIRED) | ||
| endif() | ||
| target_link_libraries(${PROJECT_NAME} raylib) | ||
|
|
||
| # Resources | ||
| # Copy all of the resource files to the destination | ||
| file(COPY "resources/" DESTINATION "resources/") | ||
|
|
Oops, something went wrong.