Просмотр исходного кода

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.
Yuri Kunde Schlesner 9 лет назад
Родитель
Сommit
34b6c8bd88
2 измененных файлов с 1 добавлено и 2 удалено
  1. 0 1
      CMakeLists.txt
  2. 1 1
      src/citra_qt/CMakeLists.txt

+ 0 - 1
CMakeLists.txt

@@ -223,7 +223,6 @@ if (ENABLE_QT)
     endif()
 
     find_package(Qt5 REQUIRED COMPONENTS Widgets OpenGL ${QT_PREFIX_HINT})
-    set(CITRA_QT_LIBS Qt5::Widgets Qt5::OpenGL)
 endif()
 
 # This function should be passed a list of all files in a target. It will automatically generate

+ 1 - 1
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 ${CITRA_QT_LIBS} Boost::boost glad)
+target_link_libraries(citra-qt PRIVATE Boost::boost glad Qt5::OpenGL Qt5::Widgets)
 target_link_libraries(citra-qt PRIVATE ${PLATFORM_LIBRARIES} Threads::Threads)
 
 if(UNIX AND NOT APPLE)