jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88 from BtbN/cmake_qt

Browse Source 
Update Qt5 usage in CMakeLists
This commit is contained in:
Jim 2014-05-18 19:01:33 -07:00
commit 1d809bab65
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
obs/CMakeLists.txt
View File

@ -46,10 +46,8 @@ elseif(UNIX)
set(obs_PLATFORM_LIBRARIES set(obs_PLATFORM_LIBRARIES
${X11_LIBRARIES} ${X11_LIBRARIES}
${X11_Xinerama_LIB}) ${X11_Xinerama_LIB}
Qt5::X11Extras)
set(obs_PLATFORM_QT_MODULES
X11Extras)
endif() endif()
set(obs_SOURCES set(obs_SOURCES
@ -101,9 +99,6 @@ add_executable(obs WIN32
${obs_UI_HEADERS} ${obs_UI_HEADERS}
${obs_QRC_SOURCES}) ${obs_QRC_SOURCES})
qt5_use_modules(obs Widgets ${obs_PLATFORM_QT_MODULES})
qt5_use_modules(obs Network ${obs_PLATFORM_QT_MODULES})
if(WIN32) if(WIN32)
if(CMAKE_SIZEOF_VOID_P EQUAL 8) if(CMAKE_SIZEOF_VOID_P EQUAL 8)
set(_output_suffix "64") set(_output_suffix "64")
@ -118,6 +113,8 @@ endif()
target_link_libraries(obs target_link_libraries(obs
libobs libobs
Qt5::Widgets
Qt5::Network
${obs_PLATFORM_LIBRARIES}) ${obs_PLATFORM_LIBRARIES})
install_obs_core(obs) install_obs_core(obs)