From e4806ab08d0293d395c1718ab16d28ba2ae9d0ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Wed, 20 Mar 2013 07:59:35 +0100
Subject: Add SVG icon rendering/cache

---
 CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cf6e1aab..fad09575 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,6 @@ ENDIF()
 # First, include header overrides
 include_directories(hacks)
 
-
 ######## 3rd Party Libs ########
 
 # Find the required Qt parts
@@ -155,7 +154,7 @@ MESSAGE(STATUS "Job URL: ${MultiMC_JOB_URL}")
 ######## Configure header ########
 configure_file("${PROJECT_SOURCE_DIR}/config.h.in"
 			   "${PROJECT_BINARY_DIR}/include/config.h")
-
+include_directories(${PROJECT_BINARY_DIR}/include)
 
 ################################ FILES ################################
 
@@ -172,6 +171,7 @@ gui/aboutdialog.h
 gui/consolewindow.h
 gui/instancemodel.h
 gui/instancedelegate.h
+gui/iconcache.h
 
 multimc_pragma.h
 
@@ -200,6 +200,7 @@ gui/aboutdialog.cpp
 gui/consolewindow.cpp
 gui/instancemodel.cpp
 gui/instancedelegate.cpp
+gui/iconcache.cpp
 
 java/javautils.cpp
 java/annotations.cpp
-- 
cgit v1.2.3


From f01bf10dc511268ead551a191a6a3211c006ba44 Mon Sep 17 00:00:00 2001
From: Orochimarufan <orochimarufan.x3@gmail.com>
Date: Sun, 24 Feb 2013 18:22:35 +0100
Subject: Implement Keyring system base

---
 CMakeLists.txt | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9ae3e784..6f0204c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -48,6 +48,7 @@ find_package(ZLIB REQUIRED)
 
 # Add quazip
 add_subdirectory(quazip)
+include_directories(quazip)
 
 # Add bspatch
 add_subdirectory(patchlib)
@@ -260,6 +261,12 @@ libUtil libSettings libMultiMC libGroupView
 ${MultiMC_LINK_ADDITIONAL_LIBS})
 ADD_DEPENDENCIES(MultiMC MultiMCLauncher libUtil libSettings libMultiMC libGroupView)
 
+IF(DEFINED MMC_KEYRING_TEST)
+# test.cpp
+ADD_EXECUTABLE(Test test.cpp)
+QT5_USE_MODULES(Test Core)
+TARGET_LINK_LIBRARIES(Test libmmcutil libmmcsettings)
+ENDIF()
 
 ################################ INSTALLATION AND PACKAGING ################################
 # use QtCreator's QTDIR var
-- 
cgit v1.2.3


From e4f86893a899ee86cfa6d238f891bec04977c966 Mon Sep 17 00:00:00 2001
From: Orochimarufan <orochimarufan.x3@gmail.com>
Date: Fri, 22 Mar 2013 14:40:55 +0100
Subject: fix merge issues, make console window work again

---
 CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 742f47f6..97ff786c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,7 +266,7 @@ IF(DEFINED MMC_KEYRING_TEST)
 # test.cpp
 ADD_EXECUTABLE(Test test.cpp)
 QT5_USE_MODULES(Test Core)
-TARGET_LINK_LIBRARIES(Test libmmcutil libmmcsettings)
+TARGET_LINK_LIBRARIES(Test libUtil libSettings)
 ENDIF()
 
 ################################ INSTALLATION AND PACKAGING ################################
-- 
cgit v1.2.3