diff options
| -rw-r--r-- | CMakeLists.txt | 3 | ||||
| -rw-r--r-- | externals/glad/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/citra/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 2 |
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 |
| 148 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules") | 148 | list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules") |
| 149 | 149 | ||
| 150 | find_package(OpenGL REQUIRED) | ||
| 151 | include_directories(${OPENGL_INCLUDE_DIR}) | ||
| 152 | |||
| 153 | # Prefer the -pthread flag on Linux. | 150 | # Prefer the -pthread flag on Linux. |
| 154 | set (THREADS_PREFER_PTHREAD_FLAG ON) | 151 | set (THREADS_PREFER_PTHREAD_FLAG ON) |
| 155 | find_package(Threads REQUIRED) | 152 | find_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 | |||
| 9 | create_directory_groups(${SRCS} ${HEADERS}) | 9 | create_directory_groups(${SRCS} ${HEADERS}) |
| 10 | add_library(glad STATIC ${SRCS} ${HEADERS}) | 10 | add_library(glad STATIC ${SRCS} ${HEADERS}) |
| 11 | target_include_directories(glad PUBLIC "include/") | 11 | target_include_directories(glad PUBLIC "include/") |
| 12 | |||
| 12 | if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") | 13 | if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") |
| 13 | target_link_libraries(glad dl) | 14 | target_link_libraries(glad PRIVATE dl) |
| 14 | endif() | 15 | endif() |
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 | ||
| 20 | add_executable(citra ${SRCS} ${HEADERS}) | 20 | add_executable(citra ${SRCS} ${HEADERS}) |
| 21 | target_link_libraries(citra PRIVATE common core input_common) | 21 | target_link_libraries(citra PRIVATE common core input_common) |
| 22 | target_link_libraries(citra PRIVATE ${SDL2_LIBRARY} ${OPENGL_gl_LIBRARY} inih glad) | 22 | target_link_libraries(citra PRIVATE ${SDL2_LIBRARY} inih glad) |
| 23 | if (MSVC) | 23 | if (MSVC) |
| 24 | target_link_libraries(citra PRIVATE getopt) | 24 | target_link_libraries(citra PRIVATE getopt) |
| 25 | endif() | 25 | endif() |
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}) |
| 93 | endif() | 93 | endif() |
| 94 | target_link_libraries(citra-qt PRIVATE audio_core common core input_common video_core) | 94 | target_link_libraries(citra-qt PRIVATE audio_core common core input_common video_core) |
| 95 | target_link_libraries(citra-qt PRIVATE ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS} Boost::boost glad) | 95 | target_link_libraries(citra-qt PRIVATE ${CITRA_QT_LIBS} Boost::boost glad) |
| 96 | target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) | 96 | target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) |
| 97 | 97 | ||
| 98 | if(UNIX AND NOT APPLE) | 98 | if(UNIX AND NOT APPLE) |