diff options
| author | Gerald Combs <gerald@wireshark.org> | 2015-12-30 11:42:32 -0800 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2015-12-30 22:40:00 +0000 |
| commit | 6084c21d741683feb2b0ce860cbc560843b98242 (patch) | |
| tree | 129323738abc17c160de64666d1f185caa09c494 /cmake/modules | |
| parent | bf8ff48ea27924ff3cef094b4997621519fef7a6 (diff) | |
CPack: Fixup plugin paths on Windows.
Fix the per-configuration output directories for plugins. Fixes the following
when running CPack:
----
CMake Error at C:/Development/wireshark/cmbuild/plugins/docsis/cmake_install.cmake:32 (file):
file INSTALL cannot find
"C:/Development/wireshark/cmbuild/run/$(Configuration)/plugins/docsis.dll".
Call Stack (most recent call first):
C:/Development/wireshark/cmbuild/cmake_install.cmake:329 (include)
----
Change-Id: I8d97722cc0d54e9ef26aeaeb311522e161c428e5
Reviewed-on: https://code.wireshark.org/review/12953
Petri-Dish: Gerald Combs <gerald@wireshark.org>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Gerald Combs <gerald@wireshark.org>
Diffstat (limited to 'cmake/modules')
| -rw-r--r-- | cmake/modules/WiresharkPlugin.cmake | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/cmake/modules/WiresharkPlugin.cmake b/cmake/modules/WiresharkPlugin.cmake index acb0506612..f982de8c04 100644 --- a/cmake/modules/WiresharkPlugin.cmake +++ b/cmake/modules/WiresharkPlugin.cmake @@ -47,13 +47,11 @@ macro(ADD_PLUGIN_LIBRARY _plugin) ) # Try to force output to ${PLUGIN_DIR} without the configuration - # type appended. + # type appended. Needed for CPack on Windows. foreach(_config_type ${CMAKE_CONFIGURATION_TYPES}) string(TOUPPER ${_config_type} _config_upper) set_target_properties(${_plugin} PROPERTIES - #ARCHIVE_OUTPUT_DIRECTORY_${_config_upper} ${PLUGIN_DIR} - LIBRARY_OUTPUT_DIRECTORY_${_config_upper} ${PLUGIN_DIR} - #RUNTIME_OUTPUT_DIRECTORY_${_config_upper} ${PLUGIN_DIR} + LIBRARY_OUTPUT_DIRECTORY_${_config_upper} ${CMAKE_BINARY_DIR}/run/${_config_type}/plugins ) endforeach() |