diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-10 20:57:30 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-10 20:57:30 +0100 |
| commit | ab69c1b9e6c25e92ded4a6ac6774e468a2e08b7b (patch) | |
| tree | afbf743f1f08f78d2d7273263b0cbea6ab9e3769 | |
| parent | 10e13df00d618c408d4772920e7bc64efc8df174 (diff) | |
| parent | f0104edc3daded9aa09e5a1b6dbfe2cc39d495dd (diff) | |
| download | MultiMC-ab69c1b9e6c25e92ded4a6ac6774e468a2e08b7b.tar MultiMC-ab69c1b9e6c25e92ded4a6ac6774e468a2e08b7b.tar.gz MultiMC-ab69c1b9e6c25e92ded4a6ac6774e468a2e08b7b.tar.lz MultiMC-ab69c1b9e6c25e92ded4a6ac6774e468a2e08b7b.tar.xz MultiMC-ab69c1b9e6c25e92ded4a6ac6774e468a2e08b7b.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
| -rw-r--r-- | CMakeLists.txt | 21 | ||||
| -rw-r--r-- | install_prereqs.cmake.in | 16 |
2 files changed, 21 insertions, 16 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index ccf2bde3..a413c700 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -576,22 +576,11 @@ FILE(WRITE \"\${CMAKE_INSTALL_PREFIX}/${QTCONF_DEST_DIR}/qt.conf\" \"\") COMPONENT Runtime ) - -INSTALL( - CODE " -FILE(GLOB_RECURSE QTPLUGINS \"\${CMAKE_INSTALL_PREFIX}/${PLUGIN_DEST_DIR}/*${CMAKE_SHARED_LIBRARY_SUFFIX}\") -function(gp_resolved_file_type_override resolved_file type_var) - if(resolved_file MATCHES \"^/usr/lib/libQt\") - message(\"resolving \${resolved_file} as other\") - set(\${type_var} other PARENT_SCOPE) - endif() -endfunction() - -include(BundleUtilities) -fixup_bundle(\"${APPS}\" \"\${QTPLUGINS}\" \"${DIRS}\") -" - COMPONENT Runtime -) +CONFIGURE_FILE( + "${CMAKE_CURRENT_SOURCE_DIR}/install_prereqs.cmake.in" + "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" + @ONLY) +INSTALL(SCRIPT "${CMAKE_CURRENT_BINARY_DIR}/install_prereqs.cmake" COMPONENT Runtime) diff --git a/install_prereqs.cmake.in b/install_prereqs.cmake.in new file mode 100644 index 00000000..7565d6cb --- /dev/null +++ b/install_prereqs.cmake.in @@ -0,0 +1,16 @@ +FILE(GLOB_RECURSE QTPLUGINS "${CMAKE_INSTALL_PREFIX}/@PLUGIN_DEST_DIR@/*@CMAKE_SHARED_LIBRARY_SUFFIX@") +function(gp_resolved_file_type_override resolved_file type_var) + if(resolved_file MATCHES "^/usr/lib/libQt") + message("resolving ${resolved_file} as other") + set(${type_var} other PARENT_SCOPE) + endif() +endfunction() + +set(gp_tool "@CMAKE_GP_TOOL@") +set(gp_cmd_paths ${gp_cmd_paths} + "@CMAKE_GP_CMD_PATHS@" +) + +include(BundleUtilities) +fixup_bundle("@APPS@" "${QTPLUGINS}" "@DIRS@") + |