diff options
| author | Andrew <forkk@forkk.net> | 2013-02-06 00:40:07 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-02-06 00:40:07 -0600 |
| commit | b66be337fdb4d9fe023f1c4912573f99cca5437c (patch) | |
| tree | ea60fab11ff136dc22a25f7fc4b46180cc6ae7ca | |
| parent | e475f5d51251ae57da0480bbadc9cb32a8bc72b2 (diff) | |
| parent | 814469eec6a28a0ed80dc0b70126399a67b4e92f (diff) | |
| download | MultiMC-b66be337fdb4d9fe023f1c4912573f99cca5437c.tar MultiMC-b66be337fdb4d9fe023f1c4912573f99cca5437c.tar.gz MultiMC-b66be337fdb4d9fe023f1c4912573f99cca5437c.tar.lz MultiMC-b66be337fdb4d9fe023f1c4912573f99cca5437c.tar.xz MultiMC-b66be337fdb4d9fe023f1c4912573f99cca5437c.zip | |
Merge branch 'master' of ciserver.forkk.net:MultiMC5
| -rw-r--r-- | CMakeLists.txt | 12 | ||||
| -rw-r--r-- | dependencies.cmake.in | 4 |
2 files changed, 13 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 984bbd05..f67b8346 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -175,7 +175,7 @@ add_executable(MultiMC ${MULTIMC_SOURCES} ${MULTIMC_HEADERS} ${MULTIMC_UI} ${MUL qt5_use_modules(MultiMC Widgets Network) target_link_libraries(MultiMC quazip patchlib ${MultiMC_LINK_ADDITIONAL_LIBS}) add_dependencies(MultiMC MultiMCLauncher) -install(TARGETS MultiMC RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}) +install(TARGETS MultiMC RUNTIME DESTINATION .) IF(WIN32) IF(CMAKE_BUILD_TYPE STREQUAL "Debug") @@ -186,7 +186,7 @@ ENDIF() install(FILES "${Qt5_DIR}/plugins/platforms/qwindows${D}.dll" DESTINATION platforms) install(FILES "${Qt5_DIR}/plugins/platforms/qminimal${D}.dll" DESTINATION platforms) -install(FILES "${Qt5_DIR}/bin/libEGL${D}.dll" DESTINATION ${CMAKE_INSTALL_PREFIX}) +install(FILES "${Qt5_DIR}/bin/libEGL${D}.dll" DESTINATION .) install(FILES "${Qt5_DIR}/plugins/imageformats/qsvg${D}.dll" DESTINATION imageformats) install(FILES "${Qt5_DIR}/plugins/imageformats/qico${D}.dll" DESTINATION imageformats) @@ -194,6 +194,14 @@ install(FILES "${Qt5_DIR}/plugins/imageformats/qgif${D}.dll" DESTINATION imagefo install(FILES "${Qt5_DIR}/plugins/imageformats/qjpeg${D}.dll" DESTINATION imageformats) ELSEIF(UNIX) +IF (APPLE) +ELSE() + +install(FILES "${Qt5_DIR}/plugins/platforms/libqlinuxfb.so" DESTINATION platforms) +install(FILES "${Qt5_DIR}/plugins/platforms/libqminimal.so" DESTINATION platforms) +install(FILES "${Qt5_DIR}/plugins/platforms/libqxcb.so" DESTINATION platforms) + +ENDIF() ENDIF() diff --git a/dependencies.cmake.in b/dependencies.cmake.in index 1790b97b..408bb811 100644 --- a/dependencies.cmake.in +++ b/dependencies.cmake.in @@ -11,8 +11,10 @@ message(STATUS "Prerequisites: ${MULTIMC_PREREQS}") FOREACH(PREREQ ${MULTIMC_PREREQS}) GET_FILENAME_COMPONENT(PREREQ_NAME "${PREREQ}" NAME) - GET_FILENAME_COMPONENT(_PREREQ_ACTUAL "${PREREQ}" REALPATH) + GET_FILENAME_COMPONENT(PREREQ_ACTUAL "${PREREQ}" REALPATH) + IF(WIN32) SET(PREREQ_ACTUAL "${Qt5_DIR}/bin/${PREREQ}") + ENDIF() message(STATUS "Adding install prerequisite: ${PREREQ_NAME}") |