diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-04-21 23:33:00 +0200 |
| commit | 9d724e0fe4bfb7b7940f3f0c9719affd22a18722 (patch) | |
| tree | c73e9566e134d2b78e6f1b8bce3c32159b17675f /install_prereqs.cmake.in | |
| parent | a9dfe6d7ec949954b07facff71ee6023e0ced9ee (diff) | |
| parent | a00fb1e8da505768b491e5f4d6266784fb1a27c9 (diff) | |
| download | MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.gz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.lz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.tar.xz MultiMC-9d724e0fe4bfb7b7940f3f0c9719affd22a18722.zip | |
Merge remote-tracking branch 'origin/feature_cmake_style' into develop
Conflicts:
CMakeLists.txt
Diffstat (limited to 'install_prereqs.cmake.in')
| -rw-r--r-- | install_prereqs.cmake.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/install_prereqs.cmake.in b/install_prereqs.cmake.in index 3ae8302d..4ed7876b 100644 --- a/install_prereqs.cmake.in +++ b/install_prereqs.cmake.in @@ -1,4 +1,4 @@ -FILE(GLOB_RECURSE QTPLUGINS "${CMAKE_INSTALL_PREFIX}/@PLUGIN_DEST_DIR@/*@CMAKE_SHARED_LIBRARY_SUFFIX@") +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") @@ -6,12 +6,12 @@ function(gp_resolved_file_type_override resolved_file type_var) elseif(resolved_file MATCHES "^/usr/lib(.+)?/libxcb") message("resolving ${resolved_file} as other") set(${type_var} other PARENT_SCOPE) - endif() + endif() endfunction() set(gp_tool "@CMAKE_GP_TOOL@") set(gp_cmd_paths ${gp_cmd_paths} - "@CMAKE_GP_CMD_PATHS@" + "@CMAKE_GP_CMD_PATHS@" ) include(BundleUtilities) |