diff options
| author | hristo <[email protected]> | 2021-01-14 00:10:02 +0200 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-01-13 23:10:02 +0100 |
| commit | 9821725c6bafeaf4153ab8604e692dfe13cbff09 (patch) | |
| tree | 5dc264f722473f8f5f6c48dcfb4d1ada5761f501 /cmake/GlfwImport.cmake | |
| parent | 3d22709808fd9ba2843e6cad5e106bcd90eecaca (diff) | |
| download | raylib-9821725c6bafeaf4153ab8604e692dfe13cbff09.tar.gz raylib-9821725c6bafeaf4153ab8604e692dfe13cbff09.zip | |
Big cmake changes (#1514)
* Delete emscripten.cmake
This file is not needed at this point. EMSDK provides a toolchain file that has a lot more things in it and is better supported. Project currently works fine with the documentation provided in Emscripten SDK on how to build projects.
* First pass file separation.
The main two files are cleaner now. Only important things can be seen. Major changes include:
- raylib_static is now the alias instead of raylib
- Repeating segments are removed and pulled into separate files into <root>/cmake
- File is reordered to make more sense
- Installs are better structured
- Library is build into an output directory "raylib" instead of "src"
- All public header files are now set as a public header file
- Source files need to be listed (it is a bad practice to capture them using wildcards and file globs)
- CMakeLists are better commented
* Second pass on the example dirs.
They are quite complex so I'm more hesitant to do major changes. Also it works pretty well. Noticed that I forgot one of the seperated files and added it into src/CMakeLists.txt.
* Returned the header copy as it was convenient to have the public headers copied.
* A better description to the variable RAYLIB_IS_MAIN
Co-authored-by: Rob Loach <[email protected]>
* Remove debug message
Co-authored-by: Rob Loach <[email protected]>
* Improvements based on review.
* Simplify the install condition to not be platform specific as it was before.
Co-authored-by: Alexander Neumann <[email protected]>
* Remove some CMAKE variables as they don't affect the build in any way
Co-authored-by: Alexander Neumann <[email protected]>
Co-authored-by: Rob Loach <[email protected]>
Co-authored-by: Alexander Neumann <[email protected]>
Diffstat (limited to 'cmake/GlfwImport.cmake')
| -rw-r--r-- | cmake/GlfwImport.cmake | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/cmake/GlfwImport.cmake b/cmake/GlfwImport.cmake new file mode 100644 index 00000000..12dbfeb9 --- /dev/null +++ b/cmake/GlfwImport.cmake @@ -0,0 +1,29 @@ + +if(USE_EXTERNAL_GLFW STREQUAL "ON") + find_package(glfw3 3.2.1 REQUIRED) +elseif(USE_EXTERNAL_GLFW STREQUAL "IF_POSSIBLE") + find_package(glfw3 3.2.1 QUIET) +endif() +if (glfw3_FOUND) + set(LIBS_PRIVATE ${LIBS_PRIVATE} glfw) +endif() + +# Explicitly check against "ON", because USE_EXTERNAL_GLFW is a tristate option +# Also adding only on desktop (web also uses glfw but it is more limited and is added using an emcc linker flag) +if(NOT glfw3_FOUND AND NOT USE_EXTERNAL_GLFW STREQUAL "ON" AND "${PLATFORM}" MATCHES "Desktop") + MESSAGE(STATUS "Using raylib's GLFW") + set(GLFW_BUILD_DOCS OFF CACHE BOOL "" FORCE) + set(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE) + set(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE) + set(GLFW_INSTALL OFF CACHE BOOL "" FORCE) + set(BUILD_SHARED_LIBS OFF CACHE BOOL " " FORCE) + set(GLFW_USE_WAYLAND ${USE_WAYLAND} CACHE BOOL "" FORCE) + + add_subdirectory(external/glfw) + + list(APPEND raylib_sources $<TARGET_OBJECTS:glfw_objlib>) + include_directories(BEFORE SYSTEM external/glfw/include) +else() + MESSAGE(STATUS "Using external GLFW") + set(GLFW_PKG_DEPS glfw3) +endif()
\ No newline at end of file |