diff options
| author |  bunnei | 2014-09-03 10:15:46 -0400 |
|---|---|---|
| committer | bunnei | 2014-09-03 10:15:46 -0400 |
| commit | fda291816b4b86ace15a210d66143a2dadc769e0 (patch) | |
| tree | d2f7820e7395aca9622a6093a9cdbbf3114490bb | |
| parent | Merge pull request #69 from yuriks/cmake-cleanup (diff) | |
| parent | Removed the need for X11 on OS X (diff) | |
| download | yuzu-fda291816b4b86ace15a210d66143a2dadc769e0.tar.gz yuzu-fda291816b4b86ace15a210d66143a2dadc769e0.tar.xz yuzu-fda291816b4b86ace15a210d66143a2dadc769e0.zip | |
Merge pull request #89 from archshift/X11-OSX
Removed the need for X11 on OS X
| -rw-r--r-- | CMakeLists.txt | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index e1614cd4a..83b0863f9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -65,7 +65,10 @@ if (ENABLE_GLFW) | |||
| 65 | 65 | ||
| 66 | set(GLFW_LIBRARIES glfw3) | 66 | set(GLFW_LIBRARIES glfw3) |
| 67 | else() | 67 | else() |
| 68 | find_package(X11 REQUIRED) | 68 | if (NOT APPLE) |
| 69 | find_package(X11 REQUIRED) | ||
| 70 | endif() | ||
| 71 | |||
| 69 | find_package(PkgConfig REQUIRED) | 72 | find_package(PkgConfig REQUIRED) |
| 70 | pkg_search_module(GLFW REQUIRED glfw3) | 73 | pkg_search_module(GLFW REQUIRED glfw3) |
| 71 | endif() | 74 | endif() |