diff options
| author | 2017-05-27 20:53:39 -0700 | |
|---|---|---|
| committer | 2017-05-27 20:53:39 -0700 | |
| commit | 34b6c8bd8853964fde3bcff95150af561415c26c (patch) | |
| tree | 7ed6f8f857eb868958433b9dfd93be4b335b06a7 | |
| parent | CMake: Stop using FindOpenGL, which seems to not be required anymore (diff) | |
| download | yuzu-34b6c8bd8853964fde3bcff95150af561415c26c.tar.gz yuzu-34b6c8bd8853964fde3bcff95150af561415c26c.tar.xz yuzu-34b6c8bd8853964fde3bcff95150af561415c26c.zip | |
CMake: Remove CITRA_QT_LIBS var
This used to be required to support both Qt4 and Qt5, but we dropped Qt4
so it's not needed anymore.
| -rw-r--r-- | CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/citra_qt/CMakeLists.txt | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 5fd63fd16..238e92dcc 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -223,7 +223,6 @@ if (ENABLE_QT) | |||
| 223 | endif() | 223 | endif() |
| 224 | 224 | ||
| 225 | find_package(Qt5 REQUIRED COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT}) | 225 | find_package(Qt5 REQUIRED COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT}) |
| 226 | set(CITRA_QT_LIBS Qt5::Widgets Qt5::OpenGL) | ||
| 227 | endif() | 226 | endif() |
| 228 | 227 | ||
| 229 | # This function should be passed a list of all files in a target. It will automatically generate | 228 | # This function should be passed a list of all files in a target. It will automatically generate |
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 839ce600b..a70686286 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 ${CITRA_QT_LIBS} Boost::boost glad) | 95 | target_link_libraries(citra-qt PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets) |
| 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) |