summaryrefslogtreecommitdiffstats
path: root/CMakeLists.txt
diff options
context:
space:
mode:
authorPetr Mrázek <peterix@gmail.com>2015-02-11 19:56:06 +0100
committerPetr Mrázek <peterix@gmail.com>2015-04-12 20:57:18 +0200
commit3d3725f08820ee129c8edc5395687e5edd997537 (patch)
treec3b880b5811190127e459059327976b3a0a2905f /CMakeLists.txt
parent47bbc349eb897ac20e4043e9acfa738633a43ebc (diff)
downloadMultiMC-3d3725f08820ee129c8edc5395687e5edd997537.tar
MultiMC-3d3725f08820ee129c8edc5395687e5edd997537.tar.gz
MultiMC-3d3725f08820ee129c8edc5395687e5edd997537.tar.lz
MultiMC-3d3725f08820ee129c8edc5395687e5edd997537.tar.xz
MultiMC-3d3725f08820ee129c8edc5395687e5edd997537.zip
SCRATCH small cmake tweaks
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r--CMakeLists.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4633b4da..ca94a98f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -37,6 +37,9 @@ include(Coverage)
set(CMAKE_CXX_FLAGS " -Wall ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -Werror=return-type")
+# cmake code needed for the coverity scan upload
+include(Coverity)
+
################################ 3rd Party Libs ################################
# Find the required Qt parts
@@ -105,9 +108,6 @@ add_definitions(-DLIBUTIL_STATIC)
add_subdirectory(depends/util)
include_directories(${LIBUTIL_INCLUDE_DIR})
-# Add the updater
-add_subdirectory(mmc_updater)
-
# Add the GUI -> Logic connection header
add_subdirectory(depends/LogicalGui)
include_directories(${LOGICALGUI_INCLUDE_DIR})
@@ -118,9 +118,12 @@ include_directories(${ICONFIX_INCLUDE_DIR})
include(Coverity)
-# Tests
+############################### Built Artifacts ###############################
+
add_subdirectory(tests)
add_subdirectory(logic)
add_subdirectory(application)
+
+add_subdirectory(mmc_updater)