Commit dff9c35c authored by Cory Quammen's avatar Cory Quammen
Browse files

Change variable names in launcher configuration file

It will be used for more than just shared forwarding in the client, so
rename the variabls from _paraview_client* -> _paraview_launcher*.
parent c4da6e6f
......@@ -337,7 +337,7 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n")
"${_paraview_client_PLUGINS_TARGET}")
endif ()
# XXX(deprecated): ParaView should not need to use this.
# Set up the forwarding executable
set(_paraview_client_destination "${_paraview_client_RUNTIME_DESTINATION}")
if (BUILD_SHARED_LIBS AND UNIX AND NOT APPLE AND _paraview_client_FORWARD_EXECUTABLE)
set(_paraview_client_build_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
......@@ -353,6 +353,11 @@ IDI_ICON1 ICON \"${_paraview_client_APPLICATION_ICON}\"\n")
",\"${_paraview_client_install_path_dir}\"")
endforeach ()
# Set up variables expected in paraview_launcher.c.in
foreach(suffix build_dir build_path install_dir install_path NAME)
set(_paraview_launcher_${suffix} ${_paraview_client_${suffix}})
endforeach ()
configure_file(
"${_ParaViewClient_cmake_dir}/paraview_client_launcher.c.in"
"${CMAKE_CURRENT_BINARY_DIR}/${_paraview_client_NAME}_launcher.c"
......
......@@ -13,11 +13,11 @@ PURPOSE. See the above copyright notice for more information.
=========================================================================*/
#define vtksys_SHARED_FORWARD_DIR_BUILD "@_paraview_client_build_dir@"
#define vtksys_SHARED_FORWARD_PATH_BUILD @_paraview_client_build_path@
#define vtksys_SHARED_FORWARD_PATH_INSTALL @_paraview_client_install_path@
#define vtksys_SHARED_FORWARD_EXE_BUILD "@_paraview_client_build_dir@/@_paraview_client_NAME@"
#define vtksys_SHARED_FORWARD_EXE_INSTALL "@_paraview_client_install_dir@/@_paraview_client_NAME@"
#define vtksys_SHARED_FORWARD_DIR_BUILD "@_paraview_launcher_build_dir@"
#define vtksys_SHARED_FORWARD_PATH_BUILD @_paraview_launcher_build_path@
#define vtksys_SHARED_FORWARD_PATH_INSTALL @_paraview_launcher_install_path@
#define vtksys_SHARED_FORWARD_EXE_BUILD "@_paraview_launcher_build_dir@/@_paraview_launcher_NAME@"
#define vtksys_SHARED_FORWARD_EXE_INSTALL "@_paraview_launcher_install_dir@/@_paraview_launcher_NAME@"
#define vtksys_SHARED_FORWARD_OPTION_PRINT "--print"
#define vtksys_SHARED_FORWARD_OPTION_LDD "--ldd"
......
......@@ -25,9 +25,9 @@ function (paraview_add_executable name)
JOB_POOL_LINK "${paraview_exe_job_link_pool}")
endif ()
set(_paraview_client_RUNTIME_DESTINATION
set(_paraview_launcher_RUNTIME_DESTINATION
"${CMAKE_INSTALL_BINDIR}")
set(_paraview_client_LIBRARY_DESTINATION
set(_paraview_launcher_LIBRARY_DESTINATION
"${CMAKE_INSTALL_LIBDIR}")
install(
......@@ -37,13 +37,13 @@ function (paraview_add_executable name)
EXPORT ParaView)
# set up forwarding executables
set(_paraview_client_destination "${_paraview_client_RUNTIME_DESTINATION}")
set(_paraview_launcher_destination "${_paraview_launcher_RUNTIME_DESTINATION}")
if (BUILD_SHARED_LIBS AND UNIX AND NOT APPLE)
set(_paraview_client_build_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
set(_paraview_client_build_path "\"${_paraview_client_build_dir}\"")
set(_paraview_client_install_dir "../${_paraview_client_LIBRARY_DESTINATION}")
set(_paraview_client_install_path "\"${_paraview_client_install_dir}\"")
set(_paraview_client_NAME ${name})
set(_paraview_launcher_build_dir "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}")
set(_paraview_launcher_build_path "\"${_paraview_launcher_build_dir}\"")
set(_paraview_launcher_install_dir "../${_paraview_launcher_LIBRARY_DESTINATION}")
set(_paraview_launcher_install_path "\"${_paraview_launcher_install_dir}\"")
set(_paraview_launcher_NAME ${name})
set(_executable_cmake_dir "${ParaView_SOURCE_DIR}/CMake")
configure_file(
"${_executable_cmake_dir}/paraview_client_launcher.c.in"
......@@ -63,14 +63,12 @@ function (paraview_add_executable name)
install(
TARGETS "${name}-launcher"
RUNTIME DESTINATION "${_paraview_client_RUNTIME_DESTINATION}")
set(_paraview_client_destination "${_paraview_client_LIBRARY_DESTINATION}")
RUNTIME DESTINATION "${_paraview_launcher_RUNTIME_DESTINATION}")
set(_paraview_launcher_destination "${_paraview_launcher_LIBRARY_DESTINATION}")
endif()
install(
TARGETS "${name}"
# TODO - need export targets?
RUNTIME DESTINATION "${_paraview_client_destination}")
# todo - setup install directory for launcher
RUNTIME DESTINATION "${_paraview_launcher_destination}")
endfunction ()
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment