mctaylors/suyu
1
0
Fork 0
forked from suyu/suyu
Code Pull requests Activity

Merge pull request #56 from xsacha/master

Browse source 
CMake Cleanup
This commit is contained in:
bunnei 2014-08-18 15:30:12 -04:00
commit 3bdf052e75
3 changed files with 16 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.6)
cmake_minimum_required(VERSION 2.8.6)
project(citra)

6
externals/qhexedit/CMakeLists.txt vendored
View file

@ -1,13 +1,15 @@
set(CMAKE_AUTOMOC ON)
set(SRCS
commands.cpp
qhexedit.cpp
qhexedit_p.cpp
xbytearray.cpp)
qt4_wrap_cpp(MOC_SRCS
set(HEADERS
qhexedit.h
qhexedit_p.h)
include_directories(${CMAKE_CURRENT_BINARY_DIR})
add_library(qhexedit STATIC ${SRCS} ${MOC_SRCS})
add_library(qhexedit STATIC ${SRCS} ${HEADERS})

32
src/citra_qt/CMakeLists.txt
View file

@ -1,3 +1,6 @@
set(CMAKE_AUTOMOC ON)
set(CMAKE_INCLUDE_CURRENT_DIR ON)
set(SRCS
bootmanager.cpp
debugger/callstack.cpp
@ -10,6 +13,7 @@ set(SRCS
main.cpp
config/controller_config.cpp
config/controller_config_util.cpp)
set (HEADERS
bootmanager.hxx
debugger/callstack.hxx
@ -18,12 +22,6 @@ set (HEADERS
debugger/registers.hxx
hotkeys.hxx
main.hxx
ui_callstack.h
ui_controller_config.h
ui_disassembler.h
ui_hotkeys.h
ui_main.h
ui_registers.h
version.h
config/controller_config.hxx
config/controller_config_util.hxx)
@ -36,28 +34,16 @@ qt4_wrap_ui(UI_HDRS
main.ui
config/controller_config.ui)
qt4_wrap_cpp(MOC_SRCS
bootmanager.hxx
debugger/callstack.hxx
debugger/disassembler.hxx
debugger/graphics.hxx
debugger/graphics_cmdlists.hxx
debugger/registers.hxx
debugger/ramview.hxx
hotkeys.hxx
main.hxx
config/controller_config.hxx
config/controller_config_util.hxx)
# add uic results to include directories
include_directories(${CMAKE_CURRENT_BINARY_DIR})
include_directories(./)
add_executable(citra-qt ${SRCS} ${HEADERS} ${MOC_SRCS} ${UI_HDRS})
add_executable(citra-qt ${SRCS} ${UI_HDRS})
if (APPLE)
target_link_libraries(citra-qt core common video_core qhexedit iconv ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${GLEW_LIBRARY} ${OPENGL_LIBRARIES})
set(ICONV_LIBRARY iconv)
else()
target_link_libraries(citra-qt core common video_core qhexedit ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${SDL2_LIBRARY} rt GLEW ${GLFW_LIBRARIES})
set(RT_LIBRARY rt)
endif()
target_link_libraries(citra-qt core common video_core qhexedit ${ICONV_LIBRARY} ${COREFOUNDATION_LIBRARY} ${QT_LIBRARIES} ${OPENGL_LIBRARIES} ${RT_LIBRARY} ${GLEW_LIBRARY} ${GLFW_LIBRARIES})
#install(TARGETS citra-qt RUNTIME DESTINATION ${bindir})