Merge pull request #6552 from lioncash/uicommon-cmake

UICommon/CMakeLists: Migrate off of add_dolphin_library
This commit is contained in:
Léo Lam 2018-03-28 12:33:24 +02:00 committed by GitHub
commit c28850045d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 6 deletions

View File

@ -1,4 +1,4 @@
set(SRCS add_library(uicommon
AutoUpdate.cpp AutoUpdate.cpp
CommandLineParse.cpp CommandLineParse.cpp
Disassembler.cpp Disassembler.cpp
@ -9,17 +9,19 @@ set(SRCS
VideoUtils.cpp VideoUtils.cpp
) )
target_link_libraries(uicommon PUBLIC
common
cpp-optparse
)
if(USE_X11) if(USE_X11)
set(SRCS ${SRCS} X11Utils.cpp) target_sources(uicommon PRIVATE X11Utils.cpp)
endif() endif()
set(LIBS common cpp-optparse)
if(LIBUSB_FOUND) if(LIBUSB_FOUND)
set(LIBS ${LIBS} ${LIBUSB_LIBRARIES}) target_link_libraries(uicommon PRIVATE ${LIBUSB_LIBRARIES})
endif() endif()
add_dolphin_library(uicommon "${SRCS}" "${LIBS}")
if(ENABLE_LLVM) if(ENABLE_LLVM)
find_package(LLVM CONFIG QUIET) find_package(LLVM CONFIG QUIET)
if(LLVM_FOUND AND TARGET LLVM) if(LLVM_FOUND AND TARGET LLVM)