Merge pull request #6552 from lioncash/uicommon-cmake

UICommon/CMakeLists: Migrate off of add_dolphin_library
dolphin-emu · Mar 28, 2018 · c288500 · c288500
2 parents fc59ec6 + a2a1838
commit c288500
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/Source/Core/UICommon/CMakeLists.txt b/Source/Core/UICommon/CMakeLists.txt
@@ -1,4 +1,4 @@
-set(SRCS
+add_library(uicommon
   AutoUpdate.cpp
   CommandLineParse.cpp
   Disassembler.cpp
@@ -9,17 +9,19 @@ set(SRCS
   VideoUtils.cpp
 )
 
+target_link_libraries(uicommon PUBLIC
+  common
+  cpp-optparse
+)
+
 if(USE_X11)
-  set(SRCS ${SRCS} X11Utils.cpp)
+  target_sources(uicommon PRIVATE X11Utils.cpp)
 endif()
 
-set(LIBS common cpp-optparse)
 if(LIBUSB_FOUND)
-  set(LIBS ${LIBS} ${LIBUSB_LIBRARIES})
+  target_link_libraries(uicommon PRIVATE ${LIBUSB_LIBRARIES})
 endif()
 
-add_dolphin_library(uicommon "${SRCS}" "${LIBS}")
-
 if(ENABLE_LLVM)
   find_package(LLVM CONFIG QUIET)
   if(LLVM_FOUND AND TARGET LLVM)