| View Issue Details [ Jump to Notes ] | [ Print ] |
| ID | Project | Category | View Status | Date Submitted | Last Update |
| 0012977 | ParaView | (No Category) | public | 2012-03-03 15:57 | 2016-08-12 09:59 |
|
| Reporter | He Yuqi | |
| Assigned To | Kitware Robot | |
| Priority | normal | Severity | minor | Reproducibility | have not tried |
| Status | closed | Resolution | moved | |
| Platform | | OS | | OS Version | |
| Product Version | 3.14 | |
| Target Version | | Fixed in Version | | |
|
| Summary | 0012977: Add support multi-configurations to fix library links in plugin |
| Description | The current ParaView build only can fixup library links correctly with Release configuartion by MSVC compiler in Windows box.
Because the plugin library has located in ${EXECUTABLE_OUTPUT_PATH}/${CMAKE_INSTALL_CONFIG_NAME} folder if use MSVC IDE to compile, and located in ${EXECUTABLE_OUTPUT_PATH} folder if use NMAKE.
Attached please found my patch to support multi-configurations that compiling by MSVC IDE and all configurations that compiling by NMAKE tool. |
| Tags | No tags attached. |
|
| Project | Release |
| Topic Name | |
| Type | incorrect functionality |
|
| Attached Files |  paraview-win32-fixup-bundle.patch [^] (2,709 bytes) 2012-03-03 15:57 [Show Content] [Hide Content]diff --git a/Applications/ParaView/CMakeLists.txt b/Applications/ParaView/CMakeLists.txt
index a997024..80077db 100644
--- a/Applications/ParaView/CMakeLists.txt
+++ b/Applications/ParaView/CMakeLists.txt
@@ -215,18 +215,7 @@ if (PARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES AND NOT APPLE)
set(APPS "\${CMAKE_INSTALL_PREFIX}/${_dir}/paraview${CMAKE_EXECUTABLE_SUFFIX}") # paths to executables
- if(WIN32)
- foreach(pluginname ${PARAVIEW_PLUGINLIST})
- list(APPEND plugin_libs "${EXECUTABLE_OUTPUT_PATH}/Release/${pluginname}.dll")
- endforeach(pluginname ${PARAVIEW_PLUGINLIST})
- else()
- foreach(pluginname ${PARAVIEW_PLUGINLIST})
- list(APPEND plugin_libs "${EXECUTABLE_OUTPUT_PATH}/lib${pluginname}.so")
- endforeach(pluginname ${PARAVIEW_PLUGINLIST})
- endif()
-
set(PARAVIEW_INSTALL_APPS ${APPS} CACHE INTERNAL "" FORCE)
- set(PARAVIEW_INSTALL_PLUGIN_LIBS ${plugin_libs} CACHE INTERNAL "" FORCE)
set(PARAVIEW_INSTALL_LIBRARY_SEARCH_PATH ${search_path} CACHE INTERNAL "" FORCE)
endif(PARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES AND NOT APPLE)
diff --git a/Applications/ParaView/LastConfigureStep/CMakeLists.txt b/Applications/ParaView/LastConfigureStep/CMakeLists.txt
index 9bd49e8..9406b5a 100644
--- a/Applications/ParaView/LastConfigureStep/CMakeLists.txt
+++ b/Applications/ParaView/LastConfigureStep/CMakeLists.txt
@@ -13,7 +13,32 @@ if(PARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES AND NOT APPLE)
install(CODE "
include(\"${ParaView_CMAKE_DIR}/BundleUtilities.cmake\")
-fixup_bundle(\"${APPS}\" \"${PARAVIEW_INSTALL_PLUGIN_LIBS}\" \"${PARAVIEW_INSTALL_LIBRARY_SEARCH_PATH}\")
+" COMPONENT BrandedRuntime)
+
+ if(WIN32)
+ if(CMAKE_CONFIGURATION_TYPES)
+ install(CODE "
+foreach (pluginname ${PARAVIEW_PLUGINLIST})
+ list (APPEND plugin_libs \"${EXECUTABLE_OUTPUT_PATH}/\${CMAKE_INSTALL_CONFIG_NAME}/\${pluginname}.dll\")
+endforeach (pluginname ${PARAVIEW_PLUGINLIST})
+" COMPONENT BrandedRuntime)
+ else(CMAKE_CONFIGURATION_TYPES)
+ install(CODE "
+foreach (pluginname ${PARAVIEW_PLUGINLIST})
+ list (APPEND plugin_libs \"${EXECUTABLE_OUTPUT_PATH}/\${pluginname}.dll\")
+endforeach (pluginname ${PARAVIEW_PLUGINLIST})
+" COMPONENT BrandedRuntime)
+ endif(CMAKE_CONFIGURATION_TYPES)
+ else(WIN32)
+ install(CODE "
+foreach (pluginname ${PARAVIEW_PLUGINLIST})
+ list (APPEND plugin_libs \"${EXECUTABLE_OUTPUT_PATH}/lib\${pluginname}.so\")
+endforeach (pluginname ${PARAVIEW_PLUGINLIST})
+" COMPONENT BrandedRuntime)
+ endif(WIN32)
+
+ install(CODE "
+fixup_bundle(\"${APPS}\" \"${plugin_libs}\" \"${PARAVIEW_INSTALL_LIBRARY_SEARCH_PATH}\")
" COMPONENT BrandedRuntime)
endif(PARAVIEW_INSTALL_THIRD_PARTY_LIBRARIES AND NOT APPLE)
|
|