hashtags/lmms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/master' into refac/memory

Browse Source
This commit is contained in:
Lukas W
2020-05-12 13:54:19 +02:00
parent a64f83e0ed f5ecddbb1f
commit 74ee6354e6
29 changed files with 186 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/install/CMakeLists.txt
View File

@@ -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()

3
cmake/modules/InstallTargetDependencies.cmake
View File

@@ -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} )