From 07ba5364f3ab16d33e7ae7c67f64c4b25e2de11f Mon Sep 17 00:00:00 2001 From: Utkarsh Ayachit Date: Thu, 3 Jun 2010 09:49:23 -0400 Subject: [PATCH] Paraview clients were ignoring set install path. The ParaView custom clients were not passing the PV_INSTALL_LIB_DIR to the build_paraview_client macro. As a consequence it was doing the default thing. Fixed that. --- Applications/AdaptiveParaView/CMakeLists.txt | 2 ++ Applications/ParaView/CMakeLists.txt | 2 ++ Applications/StreamingParaView/CMakeLists.txt | 2 ++ 3 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Applications/AdaptiveParaView/CMakeLists.txt b/Applications/AdaptiveParaView/CMakeLists.txt index f93cd01..a951229 100644 --- a/Applications/AdaptiveParaView/CMakeLists.txt +++ b/Applications/AdaptiveParaView/CMakeLists.txt @@ -45,6 +45,8 @@ build_paraview_client(adaptive_paraview ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomFilters.xml ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomSources.xml SOURCES ${Application_SOURCE_FILES} + INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}" + INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}" ) ADD_EXECUTABLE(ppRawStridedReader2 ppRawStridedReader2.cxx) diff --git a/Applications/ParaView/CMakeLists.txt b/Applications/ParaView/CMakeLists.txt index 6ec9d99..75de3ed 100644 --- a/Applications/ParaView/CMakeLists.txt +++ b/Applications/ParaView/CMakeLists.txt @@ -63,6 +63,8 @@ build_paraview_client(paraview ${PARAVIEW_EXTRA_GUI_RESOURCES} # Add any compiled in GUI configuration xmls COMPRESSED_HELP_FILE "${ParaView_BINARY_DIR}/Documentation/paraview.qch" SOURCES ${ParaView_SOURCE_FILES} + INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}" + INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}" ) # Configure the ".plugins" configuration xml for making paraview aware of the diff --git a/Applications/StreamingParaView/CMakeLists.txt b/Applications/StreamingParaView/CMakeLists.txt index e113172..c39f768 100644 --- a/Applications/StreamingParaView/CMakeLists.txt +++ b/Applications/StreamingParaView/CMakeLists.txt @@ -45,6 +45,8 @@ build_paraview_client(streaming_paraview ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomFilters.xml ${CMAKE_CURRENT_SOURCE_DIR}/CustomResources/CustomSources.xml SOURCES ${Application_SOURCE_FILES} + INSTALL_BIN_DIR "${PV_INSTALL_BIN_DIR}" + INSTALL_LIB_DIR "${PV_INSTALL_LIB_DIR}" ) IF(FALSE)#BUILD_TESTING) -- 1.7.0