Merge pull request #125 from nyue/master

Fix bug in handling OS X build via CMake
This commit is contained in:
Syoyo Fujita 2018-12-25 15:06:37 +09:00 committed by GitHub
commit dd7c9efbea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -7,17 +7,17 @@ find_package ( GLEW REQUIRED )
find_package ( GLFW3 REQUIRED ) find_package ( GLFW3 REQUIRED )
find_package ( OpenGL REQUIRED ) find_package ( OpenGL REQUIRED )
if (apple) if (APPLE)
find_library(COCOA_LIBRARY Cocoa) find_library(COCOA_LIBRARY Cocoa)
find_library(COREVIDEO_LIBRARY CoreVideo) find_library(COREVIDEO_LIBRARY CoreVideo)
find_library(IOKIT_LIBRARY IOKit) find_library(IOKIT_LIBRARY IOKit)
else () else ()
if (NOT win32) if (NOT WIN32)
# This means it is Unices # This means it is Unices
set ( GLFW3_UNIX_LINK_LIBRARIES X11 Xxf86vm Xrandr Xi Xinerama Xcursor ) set ( GLFW3_UNIX_LINK_LIBRARIES X11 Xxf86vm Xrandr Xi Xinerama Xcursor )
find_package (Threads) find_package (Threads)
endif() endif()
endif (apple) endif (APPLE)
set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD 11)