diff options
| author | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-05-28 04:46:26 +0200 |
|---|---|---|
| committer | Yuri Kunde Schlesner <yuriks@yuriks.net> | 2017-05-28 05:48:00 +0200 |
| commit | 089baa04e851676c1c04e640ef137b9025d6e5dc (patch) | |
| tree | 52f33c4ab0f63189e05337df817ebc8a92e06c94 | |
| parent | CMake: Use append instead of set to modify list (diff) | |
| download | yuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.tar yuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.tar.gz yuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.tar.bz2 yuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.tar.lz yuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.tar.xz yuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.tar.zst yuzu-089baa04e851676c1c04e640ef137b9025d6e5dc.zip | |
| -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() # Include bundled CMake modules list(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/externals/cmake-modules") -find_package(OpenGL REQUIRED) -include_directories(${OPENGL_INCLUDE_DIR}) - # Prefer the -pthread flag on Linux. set (THREADS_PREFER_PTHREAD_FLAG ON) 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 create_directory_groups(${SRCS} ${HEADERS}) add_library(glad STATIC ${SRCS} ${HEADERS}) target_include_directories(glad PUBLIC "include/") + if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") - target_link_libraries(glad dl) + target_link_libraries(glad PRIVATE dl) 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}) add_executable(citra ${SRCS} ${HEADERS}) target_link_libraries(citra PRIVATE common core input_common) -target_link_libraries(citra PRIVATE ${SDL2_LIBRARY} ${OPENGL_gl_LIBRARY} inih glad) +target_link_libraries(citra PRIVATE ${SDL2_LIBRARY} inih glad) if (MSVC) target_link_libraries(citra PRIVATE getopt) 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() add_executable(citra-qt ${SRCS} ${HEADERS} ${UI_HDRS}) endif() target_link_libraries(citra-qt PRIVATE audio_core common core input_common video_core) -target_link_libraries(citra-qt PRIVATE ${OPENGL_gl_LIBRARY} ${CITRA_QT_LIBS} Boost::boost glad) +target_link_libraries(citra-qt PRIVATE ${CITRA_QT_LIBS} Boost::boost glad) target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads) if(UNIX AND NOT APPLE) |