Skip to content

Commit

Permalink
Rename runtime dependency set
Browse files Browse the repository at this point in the history
  • Loading branch information
sodevel committed Oct 21, 2021
1 parent 84577fc commit 78ccc9d
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion cmake/functions.cmake
Expand Up @@ -115,7 +115,7 @@ function(wxfb_add_plugin PLUGIN_NAME)
# the global location. Registering the dependencies in a set and installing them later with
# the standalone command has the desired effect, but why?
install(TARGETS wxFormBuilder_${PLUGIN_NAME}
RUNTIME_DEPENDENCY_SET wxFormBuilder_deps
RUNTIME_DEPENDENCY_SET wxFormBuilder_dependencies
RUNTIME
DESTINATION ${runtimeDestination}
LIBRARY
Expand Down
6 changes: 3 additions & 3 deletions src/CMakeLists.txt
Expand Up @@ -307,7 +307,7 @@ source_group(

# Use the same dependencies set like the plugins
install(TARGETS wxFormBuilder_app
RUNTIME_DEPENDENCY_SET wxFormBuilder_deps
RUNTIME_DEPENDENCY_SET wxFormBuilder_dependencies
BUNDLE
DESTINATION ${CMAKE_INSTALL_BINDIR}
RUNTIME
Expand Down Expand Up @@ -385,7 +385,7 @@ if(WIN32)
# that the runtime distributables are getting installed along the application, these need to get
# filtered. The wxWidgets library uses the win32 search style and therefor the library path is defined
# (TODO: Unless the CMake build gets imported, what to do then?)
install(RUNTIME_DEPENDENCY_SET wxFormBuilder_deps
install(RUNTIME_DEPENDENCY_SET wxFormBuilder_dependencies
DIRECTORIES
"${wxWidgets_LIB_DIR}"
PRE_EXCLUDE_REGEXES
Expand Down Expand Up @@ -426,7 +426,7 @@ if(WIN32)
# Directories of additional libraries need to be added as well
list(APPEND extraDirectories "${wxWidgets_LIB_DIR}")
endif()
install(RUNTIME_DEPENDENCY_SET wxFormBuilder_deps
install(RUNTIME_DEPENDENCY_SET wxFormBuilder_dependencies
DIRECTORIES
${extraDirectories}
PRE_EXCLUDE_REGEXES
Expand Down

0 comments on commit 78ccc9d

Please sign in to comment.