--- ray/InstallRules/dependencies.cmake.in 2017/08/17 21:32:29 1.6 +++ ray/InstallRules/dependencies.cmake.in 2018/01/08 16:51:31 1.7 @@ -1,8 +1,3 @@ -if("${CMAKE_VERSION}" VERSION_LESS "2.8.5") - # older CMake, add to CMAKE_MODULE_PATH, use local BundleUtilities and GetPrerequisites - set(CMAKE_MODULE_PATH "@CMAKE_CURRENT_SOURCE_DIR@" ${CMAKE_MODULE_PATH}) -endif() - function(gp_item_default_embedded_path_override path) set(path "@executable_path" PARENT_SCOPE) endfunction() @@ -13,8 +8,7 @@ set(plugins "") list(APPEND plugins "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/plugins/imageformats/@GIF_PLUGIN_NAME@") list(APPEND plugins "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/plugins/imageformats/@ICO_PLUGIN_NAME@") list(APPEND plugins "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/plugins/imageformats/@JPEG_PLUGIN_NAME@") -#list(APPEND plugins "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/plugins/imageformats/@MNG_PLUGIN_NAME@") list(APPEND plugins "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/plugins/imageformats/@TIFF_PLUGIN_NAME@") list(APPEND plugins "$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/plugins/platforms/@QPA_PLUGIN_NAME@") -fixup_bundle("${CMAKE_INSTALL_PREFIX}/bin/rtrace@CMAKE_EXECUTABLE_SUFFIX@" "${plugins}" "@QT_LIBRARY_DIR@;@X11_LIBRARY_DIR@;@TIFF_LIBRARY_DIRS@") +fixup_bundle("${CMAKE_INSTALL_PREFIX}/bin/rvu@CMAKE_EXECUTABLE_SUFFIX@" "${plugins}" "@QT_LIBRARY_DIR@;@X11_LIBRARY_DIR@")