UnrealXR/raylib
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CMake: Reuse libraries found by glfw CMake config

Browse source 
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.
This commit is contained in:
Ahmad Fatoum 2018-07-03 20:28:44 +02:00
parent 33c830353b
commit 61747508b0
No known key found for this signature in database
GPG key ID: C3EAC3DE9321D59B
4 changed files with 12 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

19
cmake/utils.cmake Executable file → Normal file
View file

@ -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})