summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-08-18 21:30:12 +0200
committerbunnei <bunneidev@gmail.com>2014-08-18 21:30:12 +0200
commit3bdf052e75f97d98b4ed76c73b782cb391f06c40 (patch)
treeeb357a371e850a735efd1ea5f25de92b4e67d0e0
parentMerge pull request #52 from lioncash/memory (diff)
parentCMake Cleanup (diff)
downloadyuzu-3bdf052e75f97d98b4ed76c73b782cb391f06c40.tar
yuzu-3bdf052e75f97d98b4ed76c73b782cb391f06c40.tar.gz
yuzu-3bdf052e75f97d98b4ed76c73b782cb391f06c40.tar.bz2
yuzu-3bdf052e75f97d98b4ed76c73b782cb391f06c40.tar.lz
yuzu-3bdf052e75f97d98b4ed76c73b782cb391f06c40.tar.xz
yuzu-3bdf052e75f97d98b4ed76c73b782cb391f06c40.tar.zst
yuzu-3bdf052e75f97d98b4ed76c73b782cb391f06c40.zip
-rw-r--r--CMakeLists.txt2
-rw-r--r--externals/qhexedit/CMakeLists.txt10
-rw-r--r--src/citra_qt/CMakeLists.txt32
3 files changed, 16 insertions, 28 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c7d98347..ed790adf7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.6)
+cmake_minimum_required(VERSION 2.8.6)
project(citra)
diff --git a/externals/qhexedit/CMakeLists.txt b/externals/qhexedit/CMakeLists.txt
index cfe168ef3..29ed5d2ba 100644
--- a/externals/qhexedit/CMakeLists.txt
+++ b/externals/qhexedit/CMakeLists.txt
@@ -1,13 +1,15 @@
+set(CMAKE_AUTOMOC ON)
+
set(SRCS
commands.cpp
qhexedit.cpp
qhexedit_p.cpp
xbytearray.cpp)
-qt4_wrap_cpp(MOC_SRCS
- qhexedit.h
- qhexedit_p.h)
+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})
diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt
index 7f880df8b..5ce4e3f16 100644
--- a/src/citra_qt/CMakeLists.txt
+++ b/src/citra_qt/CMakeLists.txt
@@ -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})