summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yuri Kunde Schlesner2017-05-27 19:46:26 -0700
committerGravatar Yuri Kunde Schlesner2017-05-27 20:48:00 -0700
commit089baa04e851676c1c04e640ef137b9025d6e5dc (patch)
tree52f33c4ab0f63189e05337df817ebc8a92e06c94
parentCMake: Use append instead of set to modify list (diff)
downloadyuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.tar.gz
yuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.tar.xz
yuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.zip
CMake: Stop using FindOpenGL, which seems to not be required anymore
-rw-r--r--CMakeLists.txt3
-rw-r--r--externals/glad/CMakeLists.txt3
-rw-r--r--src/citra/CMakeLists.txt2
-rw-r--r--src/citra_qt/CMakeLists.txt2
4 files changed, 4 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index e8dc95505..5fd63fd16 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,9 +147,6 @@ endif()
147# Include bundled CMake modules 147# Include bundled CMake modules
148list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules") 148list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules")
149 149
150find_package(OpenGL REQUIRED)
151include_directories(${OPENGL_INCLUDE_DIR})
152
153# Prefer the -pthread flag on Linux. 150# Prefer the -pthread flag on Linux.
154set (THREADS_PREFER_PTHREAD_FLAG ON) 151set (THREADS_PREFER_PTHREAD_FLAG ON)
155find_package(Threads REQUIRED) 152find_package(Threads REQUIRED)
diff --git a/externals/glad/CMakeLists.txt b/externals/glad/CMakeLists.txt
index a97d4aa73..6d35a844b 100644
--- a/externals/glad/CMakeLists.txt
+++ b/externals/glad/CMakeLists.txt
@@ -9,6 +9,7 @@ set(HEADERS
9create_directory_groups(${SRCS} ${HEADERS}) 9create_directory_groups(${SRCS} ${HEADERS})
10add_library(glad STATIC ${SRCS} ${HEADERS}) 10add_library(glad STATIC ${SRCS} ${HEADERS})
11target_include_directories(glad PUBLIC "include/") 11target_include_directories(glad PUBLIC "include/")
12
12if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") 13if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux")
13 target_link_libraries(glad dl) 14 target_link_libraries(glad PRIVATE dl)
14endif() 15endif()
diff --git a/src/citra/CMakeLists.txt b/src/citra/CMakeLists.txt
index 9eddb342b..f6f2e8e91 100644
--- a/src/citra/CMakeLists.txt
+++ b/src/citra/CMakeLists.txt
@@ -19,7 +19,7 @@ include_directories(${SDL2_INCLUDE_DIR})
19 19
20add_executable(citra ${SRCS} ${HEADERS}) 20add_executable(citra ${SRCS} ${HEADERS})
21target_link_libraries(citra PRIVATE common core input_common) 21target_link_libraries(citra PRIVATE common core input_common)
22target_link_libraries(citra PRIVATE ${SDL2_LIBRARY} ${OPENGL_gl_LIBRARY} inih glad) 22target_link_libraries(citra PRIVATE ${SDL2_LIBRARY} inih glad)
23if (MSVC) 23if (MSVC)
24 target_link_libraries(citra PRIVATE getopt) 24 target_link_libraries(citra PRIVATE getopt)
25endif() 25endif()
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index e2b77a34f..839ce600b 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -92,7 +92,7 @@ else()
92 add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) 92 add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS})
93endif() 93endif()
94target_link_libraries(citra-qt PRIVATE audio_core common core input_common video_core) 94target_link_libraries(citra-qt PRIVATE audio_core common core input_common video_core)
95target_link_libraries(citra-qt PRIVATE ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS} Boost::boost glad) 95target_link_libraries(citra-qt PRIVATE ${CITRA_QT_LIBS} Boost::boost glad)
96target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) 96target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
97 97
98if(UNIX AND NOT APPLE) 98if(UNIX AND NOT APPLE)