summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOrochimarufan <orochimarufan.x3@gmail.com>2013-02-21 21:55:47 +0100
committerOrochimarufan <orochimarufan.x3@gmail.com>2013-02-21 21:55:47 +0100
commiteda7b6cf9d3c5d40a211c72bc2032f2b68baf87f (patch)
treeefb201121074db61fc2771dece3983ce2403b2ba
parentd891032219c3faaa13a9d9a4d52659866e6773da (diff)
parent9118de4b7c8b6bbd9c4e7267836dd3e9690886d4 (diff)
downloadMultiMC-eda7b6cf9d3c5d40a211c72bc2032f2b68baf87f.tar
MultiMC-eda7b6cf9d3c5d40a211c72bc2032f2b68baf87f.tar.gz
MultiMC-eda7b6cf9d3c5d40a211c72bc2032f2b68baf87f.tar.lz
MultiMC-eda7b6cf9d3c5d40a211c72bc2032f2b68baf87f.tar.xz
MultiMC-eda7b6cf9d3c5d40a211c72bc2032f2b68baf87f.zip
Merge branch 'inst_rewrite' of http://github.com/Forkk/MultiMC5
-rw-r--r--CMakeLists.txt10
-rw-r--r--plugins/stdinstance/CMakeLists.txt4
2 files changed, 9 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86619f0d..272250ad 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
@@ -341,11 +345,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
diff --git a/plugins/stdinstance/CMakeLists.txt b/plugins/stdinstance/CMakeLists.txt
index 0bb466ec..b25b93b2 100644
--- a/plugins/stdinstance/CMakeLists.txt
+++ b/plugins/stdinstance/CMakeLists.txt
@@ -37,6 +37,10 @@ add_library(stdinstance SHARED ${STDINST_SOURCES} ${STDINST_HEADERS})
set_target_properties(stdinstance PROPERTIES PREFIX "")
set_target_properties(stdinstance PROPERTIES RUNTIME_OUTPUT_DIRECTORY "..")
+IF(UNIX)
+ set_target_properties(stdinstance PROPERTIES LIBRARY_OUTPUT_DIRECTORY "..")
+ENDIF()
+
qt5_use_modules(stdinstance Core Network)
target_link_libraries(stdinstance
quazip