ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6593 from lioncash/headless 

DolphinNoGUI/CMakeLists: Remove the use of SRCS and LIBS variables
This commit is contained in:
Léo Lam 2018-04-05 10:07:31 +02:00 committed by GitHub
parent 39cb22ddc9 84ed6fd445
commit d0b7c013a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
CMakeLists.txt
View File

@ -80,9 +80,6 @@ include(DolphinCompileDefinitions)
# Enable folders for IDE # Enable folders for IDE
set_property(GLOBAL PROPERTY USE_FOLDERS ON) set_property(GLOBAL PROPERTY USE_FOLDERS ON)
# Libraries to link
set(LIBS)
# Set up paths # Set up paths
set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir") set(bindir ${CMAKE_INSTALL_PREFIX}/bin CACHE PATH "bindir")
if(HAIKU) if(HAIKU)
@ -386,8 +383,6 @@ elseif(HAIKU)
set(USE_X11 0) set(USE_X11 0)
set(USE_UPNP 0) set(USE_UPNP 0)
set(USE_EGL 0) set(USE_EGL 0)
elseif(CMAKE_SYSTEM_NAME STREQUAL "Linux")
list(APPEND LIBS rt)
endif() endif()
if(ENABLE_HEADLESS) if(ENABLE_HEADLESS)

9
Source/Core/DolphinNoGUI/CMakeLists.txt
View File

@ -2,16 +2,17 @@ if(NOT(USE_X11 OR ENABLE_HEADLESS))
return() return()
endif() endif()
set(NOGUI_SRCS MainNoGUI.cpp) add_executable(dolphin-nogui
MainNoGUI.cpp
)
add_executable(dolphin-nogui ${NOGUI_SRCS})
set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME dolphin-emu-nogui) set_target_properties(dolphin-nogui PROPERTIES OUTPUT_NAME dolphin-emu-nogui)
target_link_libraries(dolphin-nogui PRIVATE target_link_libraries(dolphin-nogui
PRIVATE
core core
uicommon uicommon
cpp-optparse cpp-optparse
${LIBS}
) )
set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} dolphin-nogui) set(CPACK_PACKAGE_EXECUTABLES ${CPACK_PACKAGE_EXECUTABLES} dolphin-nogui)