diff options
| author | Ahmad Fatoum <[email protected]> | 2018-07-03 20:28:44 +0200 |
|---|---|---|
| committer | Ahmad Fatoum <[email protected]> | 2018-07-03 21:35:27 +0200 |
| commit | 61747508b0b0ee77b1de40a1c7f0a483c1a07e05 (patch) | |
| tree | 8c7f3951d762bd0400e9dc99de7a9457d82754df /cmake | |
| parent | 33c830353b2d9f9a0f33e87b27ba36b3c6da6076 (diff) | |
| download | raylib-61747508b0b0ee77b1de40a1c7f0a483c1a07e05.tar.gz raylib-61747508b0b0ee77b1de40a1c7f0a483c1a07e05.zip | |
CMake: Reuse libraries found by glfw CMake config
if (${PLATFORM} MATCHES "Desktop")
target_link_libraries(${RAYLIB}_shared glfw ${GLFW_LIBRARIES})
was never true because PLATFORM STREQUAL "PLATFORM_DESKTOP"...
This fixes #551 and makes the changes suggested in #552 (commited as 965cc8ab)
unnecessary.
Diffstat (limited to 'cmake')
| -rw-r--r--[-rwxr-xr-x] | cmake/utils.cmake | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/cmake/utils.cmake b/cmake/utils.cmake index 7801a1cc..417384ad 100755..100644 --- a/cmake/utils.cmake +++ b/cmake/utils.cmake @@ -11,13 +11,8 @@ if(${PLATFORM} MATCHES "Android") elseif(${PLATFORM} MATCHES "Web") elseif(APPLE) find_library(OPENGL_LIBRARY OpenGL) - find_library(COCOA_LIBRARY Cocoa) - find_library(IOKIT_LIBRARY IOKit) - find_library(COREFOUNDATION_LIBRARY CoreFoundation) - find_library(COREVIDEO_LIBRARY CoreVideo) - set(LIBS_PRIVATE ${OPENGL_LIBRARY} ${COCOA_LIBRARY} - ${IOKIT_LIBRARY} ${COREFOUNDATION_LIBRARY} ${COREVIDEO_LIBRARY}) + set(LIBS_PRIVATE ${OPENGL_LIBRARY}) elseif(WIN32) # no pkg-config --static on Windows yet... else() @@ -34,12 +29,6 @@ else() endif() set(LIBS_PRIVATE m pthread ${OPENGL_LIBRARIES} ${OSS_LIBRARY}) - # TODO: maybe read those out of glfw's cmake config? - if(USE_WAYLAND) - set(LIBS_PRIVATE ${LIBS_PRIVATE} wayland-client wayland-cursor wayland-egl) - else() - set(LIBS_PRIVATE ${LIBS_PRIVATE} X11 Xrandr Xinerama Xi Xxf86vm Xcursor) - endif() endif() if(${PLATFORM} MATCHES "Desktop") @@ -53,14 +42,8 @@ if(${PLATFORM} MATCHES "Desktop") endif() endif() -# Ugly crutch. Temporary workaround for #551 -if("${CMAKE_SYSTEM_NAME}" MATCHES "(Free|Net|Open)BSD|DragonFly") - link_directories("${CMAKE_INSTALL_PREFIX}/lib") -endif() - if(CMAKE_SYSTEM_NAME STREQUAL Linux) set(LINUX TRUE) - set(LIBS_PRIVATE dl ${LIBS_PRIVATE}) endif() foreach(L ${LIBS_PRIVATE}) |