diff --git a/cmake/install/CMakeLists.txt b/cmake/install/CMakeLists.txt index e123ae384..cd4100c9b 100644 --- a/cmake/install/CMakeLists.txt +++ b/cmake/install/CMakeLists.txt @@ -32,7 +32,7 @@ IF(LMMS_BUILD_WIN32 OR LMMS_INSTALL_DEPENDENCIES) TARGETS ${PLUGINS_BUILT} DESTINATION ${PLUGIN_DEP_DESTINATION} LIB_DIRS ${LIB_DIRS} "${PLUGIN_DIR}" "${PLUGIN_DIR}/optional" - SEARCH_PATH "${PLUGIN_DIR}" "${PLUGIN_DIR}/optional" + SEARCH_PATHS "${PLUGIN_DIR}" "${PLUGIN_DIR}/optional" ) ENDIF() diff --git a/cmake/modules/InstallTargetDependencies.cmake b/cmake/modules/InstallTargetDependencies.cmake index 9665a0b87..8e48c9ef7 100644 --- a/cmake/modules/InstallTargetDependencies.cmake +++ b/cmake/modules/InstallTargetDependencies.cmake @@ -12,12 +12,13 @@ SET(DEFAULT_SEARCH_SUFFIXES "bin" "lib" "../bin") # DESTINATION: directory path to install the binaries to. # LIB_DIRS: list of paths for looking up dependencies. # LIB_DIRS_SUFFIXES: list of possible suffixes for LIB_DIRS entries. +# SEARCH_PATHS: list of library search paths on runtime # NO_DEFAULT_PATHS: supply this value to avoid adding DEFAULT_SEARCH_DIRECTORIES # to LIB_DIRS and DEFAULT_SEARCH_SUFFIXES to LIB_DIRS_SUFFIXES. FUNCTION(INSTALL_TARGET_DEPENDENCIES) set(options NO_DEFAULT_PATHS) set(oneValueArgs NAME) - set(multiValueArgs TARGETS DESTINATION LIB_DIRS_SUFFIXES LIB_DIRS) + set(multiValueArgs TARGETS DESTINATION LIB_DIRS_SUFFIXES LIB_DIRS SEARCH_PATHS) cmake_parse_arguments(DEPS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN} )