From 2e0f6091b49f7bec67b33a09667f0d9b798c3a76 Mon Sep 17 00:00:00 2001
From: Andrew <forkk@forkk.net>
Date: Thu, 21 Feb 2013 14:36:01 -0600
Subject: Changed java/endian.h to java/javaendian.h in CMakeLists

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

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0cb80bbc..c2fcc55f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -170,7 +170,7 @@ multimc_pragma.h
 java/annotations.h
 java/classfile.h
 java/constants.h
-java/endian.h
+java/javaendian.h
 java/errors.h
 java/javautils.h
 java/membuffer.h
-- 
cgit v1.2.3


From 9118de4b7c8b6bbd9c4e7267836dd3e9690886d4 Mon Sep 17 00:00:00 2001
From: Andrew Okin <forkk@forkk.net>
Date: Thu, 21 Feb 2013 14:52:23 -0600
Subject: Fixed install on Linux

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

(limited to 'CMakeLists.txt')

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c2fcc55f..bb8d7671 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -8,6 +8,10 @@ SET(CMAKE_INCLUDE_CURRENT_DIR ON)
 # Output all executables and shared libs in the main build folder, not in subfolders.
 SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
 
+IF(UNIX)
+	SET(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+ENDIF()
+
 ######## Set compiler flags ########
 IF(APPLE)
 	# assume clang 4.1.0+, add C++0x/C++11 stuff
@@ -331,11 +335,7 @@ INSTALL(CODE "
 
 
 # Dirs to look for dependencies.
-SET(DIRS "${QT_LIBRARY_DIRS}
-${CMAKE_BINARY_DIR}/libutil
-${CMAKE_BINARY_DIR}/libsettings
-${CMAKE_BINARY_DIR}/libinstance")
-message(STATUS "${DIRS}")
+SET(DIRS "${QT_LIBRARY_DIRS}")
 
 INSTALL(CODE "
 	file(GLOB_RECURSE QTPLUGINS
-- 
cgit v1.2.3