CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

Browse Source 
This pulls in some changes I made to the CMakeLists file earlier.
This commit is contained in:
Andrew 2013-10-01 03:31:20 -05:00
commit 22bdf67bf7
1 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
CMakeLists.txt
View File

@ -377,9 +377,9 @@ ENDIF()
######## Plugin and library folders ######## ######## Plugin and library folders ########
SET(PLUGIN_DEST_DIR bin) SET(PLUGIN_DEST_DIR plugins)
SET(QTCONF_DEST_DIR bin) SET(QTCONF_DEST_DIR .)
SET(APPS "\${CMAKE_INSTALL_PREFIX}/bin/MultiMC") SET(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC")
IF(WIN32) IF(WIN32)
SET(PLUGIN_DEST_DIR .) SET(PLUGIN_DEST_DIR .)
@ -387,10 +387,14 @@ IF(WIN32)
SET(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.exe") SET(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.exe")
ENDIF() ENDIF()
IF(UNIX)
IF(APPLE) IF(APPLE)
SET(PLUGIN_DEST_DIR MultiMC.app/Contents/MacOS) SET(PLUGIN_DEST_DIR MultiMC.app/Contents/MacOS)
SET(QTCONF_DEST_DIR MultiMC.app/Contents/Resources) SET(QTCONF_DEST_DIR MultiMC.app/Contents/Resources)
SET(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app") SET(APPS "\${CMAKE_INSTALL_PREFIX}/MultiMC.app")
ELSE()
SET(APPS "\${CMAKE_INSTALL_PREFIX}/bin/MultiMC")
ENDIF()
ENDIF() ENDIF()
SET(QT_PLUGINS_DIR ${Qt5_DIR}/plugins) SET(QT_PLUGINS_DIR ${Qt5_DIR}/plugins)
@ -414,6 +418,7 @@ ENDIF(APPLE)
IF(WIN32) IF(WIN32)
INSTALL(TARGETS MultiMC INSTALL(TARGETS MultiMC
BUNDLE DESTINATION . COMPONENT Runtime BUNDLE DESTINATION . COMPONENT Runtime
LIBRARY DESTINATION . COMPONENT Runtime
RUNTIME DESTINATION . COMPONENT Runtime RUNTIME DESTINATION . COMPONENT Runtime
) )
ENDIF() ENDIF()
@ -426,7 +431,7 @@ INSTALL(TARGETS MultiMC
ELSE() ELSE()
INSTALL(TARGETS MultiMC INSTALL(TARGETS MultiMC
BUNDLE DESTINATION . COMPONENT Runtime BUNDLE DESTINATION . COMPONENT Runtime
RUNTIME DESTINATION . COMPONENT Runtime RUNTIME DESTINATION bin COMPONENT Runtime
) )
ENDIF() ENDIF()
ENDIF() ENDIF()
@ -434,27 +439,31 @@ ENDIF()
#### Plugins #### #### Plugins ####
# # Image formats OPTION(MultiMC_INSTALL_SHARED_LIBS "if set, Qt's shared libraries will be copied to the installation directory on install")
# INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/imageformats" DESTINATION ${PLUGIN_DEST_DIR} COMPONENT Runtime)
# IF (MultiMC_INSTALL_SHARED_LIBS)
# # Platform plugins # Image formats
# INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/platforms" DESTINATION ${PLUGIN_DEST_DIR} COMPONENT Runtime) INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/imageformats" DESTINATION ${PLUGIN_DEST_DIR} COMPONENT Runtime)
#
# # qtconf # Platform plugins
# INSTALL(CODE " INSTALL(DIRECTORY "${QT_PLUGINS_DIR}/platforms" DESTINATION ${PLUGIN_DEST_DIR} COMPONENT Runtime)
# FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\")
# " COMPONENT Runtime) # qtconf
# INSTALL(CODE "
# FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\")
# # Dirs to look for dependencies. " COMPONENT Runtime)
# SET(DIRS "${QT_LIBRARY_DIRS}")
#
# INSTALL(CODE " # Dirs to look for dependencies.
# file(GLOB_RECURSE QTPLUGINS SET(DIRS "${QT_LIBRARY_DIRS}")
# \"\${CMAKE_INSTALL_PREFIX}/${PLUGIN_DEST_DIR}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
# include(BundleUtilities) INSTALL(CODE "
# fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\") file(GLOB_RECURSE QTPLUGINS
# " COMPONENT Runtime) \"\${CMAKE_INSTALL_PREFIX}/${PLUGIN_DEST_DIR}/plugins/*${CMAKE_SHARED_LIBRARY_SUFFIX}\")
include(BundleUtilities)
fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\")
" COMPONENT Runtime)
ENDIF()
######## Package ######## ######## Package ########