0xf8/pollymc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'inst_rewrite' of http://github.com/Forkk/MultiMC5

Browse Source
This commit is contained in:
Orochimarufan 2013-02-21 21:55:47 +01:00
commit eda7b6cf9d
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

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

4
plugins/stdinstance/CMakeLists.txt
View File

@ -37,6 +37,10 @@ add_library(stdinstance SHARED ${STDINST_SOURCES} ${STDINST_HEADERS})
set_target_properties(stdinstance PROPERTIES PREFIX "") set_target_properties(stdinstance PROPERTIES PREFIX "")
set_target_properties(stdinstance PROPERTIES RUNTIME_OUTPUT_DIRECTORY "..") 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) qt5_use_modules(stdinstance Core Network)
target_link_libraries(stdinstance target_link_libraries(stdinstance
quazip quazip