aboutsummaryrefslogtreecommitdiff
path: root/src/CMakeLists.txt
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2014-09-01 22:29:23 -0400
committerbunnei <bunneidev@gmail.com>2014-09-01 22:29:23 -0400
commitc0e48432cd262baa6ed84b33cd9dd0d8f585e345 (patch)
tree0ed8ccb8b5c42ee27c0c44969771bbd77af8ebf8 /src/CMakeLists.txt
parent76372feb1959c0f53d02c2278ef4a14b794a808d (diff)
parentc57de3e4046c662c5179d3b55340361a046a57ff (diff)
Merge pull request #69 from yuriks/cmake-cleanup
CMake cleanup
Diffstat (limited to 'src/CMakeLists.txt')
-rw-r--r--src/CMakeLists.txt13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index e0227dc53..cb09f3cd1 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,12 @@
+# Enable modules to include each other's files
+include_directories(.)
+
add_subdirectory(common)
add_subdirectory(core)
add_subdirectory(video_core)
-add_subdirectory(citra)
-add_subdirectory(citra_qt)
-
-if(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND AND QT_QTOPENGL_FOUND AND NOT DISABLE_QT4)
- #add_subdirectory(citra_qt)
+if (ENABLE_GLFW)
+ add_subdirectory(citra)
+endif()
+if (ENABLE_QT)
+ add_subdirectory(citra_qt)
endif()