Commit ac9a3f46 authored by jcfr's avatar jcfr
Browse files

COMP: Rename variable Slicer3_INSTALL_* into Slicer_INSTALL_*

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15070 3bd1e089-480b-0410-8dfb-8563597acbee
parent d5cdc951
......@@ -53,7 +53,7 @@ if(BatchMake_DIR)
"${BatchMake_WRAPPED_APPLICATION_DIR}/bmGridSend.bmm"
"${BatchMake_WRAPPED_APPLICATION_DIR}/bmGridStore.bmm" )
install(FILES ${RUNTIME_SUPPORT_FILES}
DESTINATION ${Slicer3_INSTALL_PLUGINS_SHARE_DIR})
DESTINATION ${Slicer_INSTALL_PLUGINS_SHARE_DIR})
endif(Slicer3_SOURCE_DIR)
endif( BatchMake_DIR)
......
......@@ -37,16 +37,16 @@ if(BatchMake_DIR)
${Slicer3_BINARY_DIR}/bin/debug
${Slicer3_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}
${Slicer3_BINARY_DIR}/bin
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer3_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR})
${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR})
if(WIN32)
set(BatchMake_WRAPPED_APPLICATION_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE})
......@@ -95,7 +95,7 @@ if(BatchMake_DIR)
"${CMAKE_CURRENT_SOURCE_DIR}/${Slicer3BatchModule}.xml"
"${BatchMake_WRAPPED_APPLICATION_DIR}/${Slicer3ExeModule}.bmm")
install(FILES ${RUNTIME_SUPPORT_FILES}
DESTINATION ${Slicer3_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
DESTINATION ${Slicer_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
endif(Slicer3_SOURCE_DIR)
......
......@@ -60,16 +60,16 @@ if(BatchMake_DIR)
${Slicer3_BINARY_DIR}/bin/debug
${Slicer3_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}
${Slicer3_BINARY_DIR}/bin
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer3_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR})
${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR})
if(WIN32)
set(BatchMake_WRAPPED_APPLICATION_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE})
......@@ -129,7 +129,7 @@ if(BatchMake_DIR)
# "${BatchMake_WRAPPED_APPLICATION_DIR}/bmGridStore.bmm"
"${BatchMake_WRAPPED_APPLICATION_DIR}/${Slicer3ExeModule}.bmm")
install(FILES ${RUNTIME_SUPPORT_FILES}
DESTINATION ${Slicer3_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
DESTINATION ${Slicer_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
endif(Slicer3_SOURCE_DIR)
......
......@@ -37,16 +37,16 @@ if(BatchMake_DIR)
${Slicer3_BINARY_DIR}/bin/debug
${Slicer3_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}
${Slicer3_BINARY_DIR}/bin
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer3_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR})
${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR})
if(WIN32)
set(BatchMake_WRAPPED_APPLICATION_DIR ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/${CMAKE_BUILD_TYPE})
......@@ -95,7 +95,7 @@ if(BatchMake_DIR)
"${CMAKE_CURRENT_SOURCE_DIR}/${Slicer3BatchModule}.xml"
"${BatchMake_WRAPPED_APPLICATION_DIR}/${Slicer3ExeModule}.bmm")
install(FILES ${RUNTIME_SUPPORT_FILES}
DESTINATION ${Slicer3_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
DESTINATION ${Slicer_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
endif(Slicer3_SOURCE_DIR)
......
......@@ -37,16 +37,16 @@ if(BatchMake_DIR)
${Slicer3_BINARY_DIR}/bin/debug
${Slicer3_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}
${Slicer3_BINARY_DIR}/bin
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer3_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR})
${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR})
#message( >>>>>>> Slicer3ExeModulePath ${AppPath} )
set( Slicer3ExeModulePath ${${Slicer3ExeModule}Path} )
if(WIN32)
......@@ -98,7 +98,7 @@ if(BatchMake_DIR)
# "${BatchMake_WRAPPED_APPLICATION_DIR}/bmGridStore.bmm"
# "${BatchMake_WRAPPED_APPLICATION_DIR}/${Slicer3ExeModule}.bmm")
install(FILES ${RUNTIME_SUPPORT_FILES}
DESTINATION ${Slicer3_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
DESTINATION ${Slicer_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
endif(Slicer3_SOURCE_DIR)
......
......@@ -36,16 +36,16 @@ if(BatchMake_DIR)
${Slicer3_BINARY_DIR}/bin/debug
${Slicer3_BINARY_DIR}/bin/${CMAKE_BUILD_TYPE}
${Slicer3_BINARY_DIR}/bin
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer3_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR})
${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${Slicer_INSTALL_PLUGINS_BIN_DIR}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/relwithdebinfo
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/release
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/debug
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${CMAKE_BUILD_TYPE}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR})
set( Slicer3ExeModulePath ${${Slicer3ExeModule}Path} )
if(WIN32)
......@@ -95,7 +95,7 @@ if(BatchMake_DIR)
# "${BatchMake_WRAPPED_APPLICATION_DIR}/bmGridStore.bmm"
# "${BatchMake_WRAPPED_APPLICATION_DIR}/${Slicer3ExeModule}.bmm")
install(FILES ${RUNTIME_SUPPORT_FILES}
DESTINATION ${Slicer3_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
DESTINATION ${Slicer_INSTALL_PLUGINS_SHARE_DIR}/${PROJECT_NAME})
endif(Slicer3_SOURCE_DIR)
......
......@@ -53,17 +53,17 @@ IF ( Java_JAVAC_EXECUTABLE )
${Java_JAVAC_EXECUTABLE} -d ${CMAKE_CURRENT_BINARY_DIR} -classpath ${${CLP}_CLASSPATH} ${${CLP}_JAR_SRCS}
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR} )
# message (STATUS "Adding a custom target to jar it up into the plug ins directory ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${build_type}")
# message (STATUS "Adding a custom target to jar it up into the plug ins directory ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${build_type}")
ADD_CUSTOM_TARGET ( ${CLP}.jar ALL
${Java_JAR_EXECUTABLE} cvf ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${CLP}.jar Examples
${Java_JAR_EXECUTABLE} cvf ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${CLP}.jar Examples
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} )
ADD_DEPENDENCIES ( ${CLP}.jar ${CLP}.jar.classes )
# install the jar file
install (
FILES ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${CLP}.jar
DESTINATION ${Slicer3_INSTALL_PLUGINS_BIN_DIR}
FILES ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${CLP}.jar
DESTINATION ${Slicer_INSTALL_PLUGINS_BIN_DIR}
)
#####
......@@ -82,17 +82,17 @@ IF ( Java_JAVAC_EXECUTABLE )
foreach(file ${TARGETS})
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/${file}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${file}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${file}
COPYONLY
)
endforeach(file)
# install(
# FILES ${TARGETS}
# DESTINATION ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${build_type}
# DESTINATION ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${build_type}
# )
install (
FILES ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${CLP}.tcl
DESTINATION ${Slicer3_INSTALL_PLUGINS_BIN_DIR}
FILES ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${CLP}.tcl
DESTINATION ${Slicer_INSTALL_PLUGINS_BIN_DIR}
)
endif (Slicer3_SOURCE_DIR)
......@@ -124,13 +124,13 @@ if (Slicer3_SOURCE_DIR)
foreach(file ${TARGETS})
configure_file(
${CMAKE_CURRENT_SOURCE_DIR}/${file}
${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${file}
${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${build_type}/${file}
COPYONLY
)
endforeach(file)
install(
FILES ${TARGETS}
DESTINATION ${CMAKE_BINARY_DIR}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}/${build_type}
DESTINATION ${CMAKE_BINARY_DIR}/${Slicer_INSTALL_PLUGINS_BIN_DIR}/${build_type}
)
endif (Slicer3_SOURCE_DIR)
......
......@@ -21,7 +21,7 @@ if(NOT WIN32)
endif(NOT WIN32)
set(Slicer3_EXE_SUFFIX)
set(Slicer3_EXE_INSTALL ${Slicer3_INSTALL_BIN_DIR})
set(Slicer3_EXE_INSTALL ${Slicer_INSTALL_BIN_DIR})
if(BUILD_SHARED_LIBS)
set(Slicer3_NEED_SHARED_FORWARD 1)
set(Slicer3_EXE_SUFFIX -real)
......@@ -35,33 +35,33 @@ if(BUILD_SHARED_LIBS)
"\"../lib/TclTk/bin\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\"")
if(Slicer3_BUILD_MODULES)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\" CONFIG_DIR_POST")
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\" CONFIG_DIR_POST")
endif(Slicer3_BUILD_MODULES)
if(Slicer3_BUILD_CLI)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}\" CONFIG_DIR_POST")
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_PLUGINS_BIN_DIR}\" CONFIG_DIR_POST")
endif(Slicer3_BUILD_CLI)
else(WIN32)
set(Slicer3_FORWARD_PATH_BUILD
"\"${Slicer3_FORWARD_DIR_BUILD}\",\"${VTK_DIR}/bin\",\"${KWWidgets_RUNTIME_DIRS}\",\"${ITK_DIR}/bin\",\"${Teem_DIR}/bin\",\"${TCL_DIR}/bin\",\"${INCR_TCL_LIBRARY_PATH}\",\"${INCR_TK_LIBRARY_PATH}\",\"${OPENGL_gl_LIBRARY_PATH}\"")
set(Slicer3_FORWARD_PATH_INSTALL
"\"../${Slicer3_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\",\"../lib/Teem-${Teem_VERSION_MAJOR}.${Teem_VERSION_MINOR}\",\"../lib/TclTk/lib\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\",\"../lib/FreeSurfer\",\"../lib/IGT\",\"../lib/ITKCommandIO\",\"../lib/LoadableModule\",\"../lib/MGHImageIO\",\"../lib/MRML\",\"../lib/ModuleDescriptionParser\",\"../lib/MRMLIDImageIO\",\"../lib/Qdec\",\"../lib/RemoteIO\",\"../lib/SlicerIO\",\"../lib/tclap\",\"../lib/vtkITK\",\"../lib/vtkTeem\"")
"\"../${Slicer_INSTALL_LIB_DIR}\",\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\",\"../lib/KWWidgets\",\"../lib/InsightToolkit\",\"../lib/Teem-${Teem_VERSION_MAJOR}.${Teem_VERSION_MINOR}\",\"../lib/TclTk/lib\",\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\",\"../lib/FreeSurfer\",\"../lib/IGT\",\"../lib/ITKCommandIO\",\"../lib/LoadableModule\",\"../lib/MGHImageIO\",\"../lib/MRML\",\"../lib/ModuleDescriptionParser\",\"../lib/MRMLIDImageIO\",\"../lib/Qdec\",\"../lib/RemoteIO\",\"../lib/SlicerIO\",\"../lib/tclap\",\"../lib/vtkITK\",\"../lib/vtkTeem\"")
if(Slicer3_BUILD_MODULES)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\"")
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\"")
endif(Slicer3_BUILD_MODULES)
if(Slicer3_BUILD_CLI)
set(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}\"")
"${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_PLUGINS_BIN_DIR}\"")
endif(Slicer3_BUILD_CLI)
endif(WIN32)
if(Slicer3_BUILD_MODULES)
set(Slicer3_FORWARD_PATH_INSTALL
"${Slicer3_FORWARD_PATH_INSTALL},\"../${Slicer3_INSTALL_MODULES_BIN_DIR}\"")
"${Slicer3_FORWARD_PATH_INSTALL},\"../${Slicer_INSTALL_MODULES_BIN_DIR}\"")
endif(Slicer3_BUILD_MODULES)
if(Slicer3_BUILD_CLI)
set(Slicer3_FORWARD_PATH_INSTALL
"${Slicer3_FORWARD_PATH_INSTALL},\"../${Slicer3_INSTALL_PLUGINS_BIN_DIR}\"")
"${Slicer3_FORWARD_PATH_INSTALL},\"../${Slicer_INSTALL_PLUGINS_BIN_DIR}\"")
endif(Slicer3_BUILD_CLI)
endif(BUILD_SHARED_LIBS)
......@@ -80,7 +80,7 @@ if(Slicer3_NEED_SHARED_FORWARD)
${CMAKE_CURRENT_BINARY_DIR}/${slicer_exe}-forward.c)
add_dependencies(${slicer_exe} ${Slicer3_FORWARD_EXE})
install(TARGETS ${slicer_exe}
DESTINATION ${Slicer3_INSTALL_BIN_DIR}
DESTINATION ${Slicer_INSTALL_BIN_DIR}
COMPONENT Runtime)
endforeach(slicer_exe)
endif(Slicer3_NEED_SHARED_FORWARD)
......@@ -266,7 +266,7 @@ endif(Slicer3_USE_PYTHON AND PYTHON_LIBRARIES)
# Install
#
install(TARGETS Slicer3${Slicer3_EXE_SUFFIX}
DESTINATION ${Slicer3_INSTALL_BIN_DIR}
DESTINATION ${Slicer_INSTALL_BIN_DIR}
COMPONENT Runtime)
# --------------------------------------------------------------------------
......
......@@ -414,7 +414,7 @@ int Slicer3_main(int& argc, char *argv[])
bool hasIntDir = false;
std::string intDir = "";
std::string tmpName = slicerBinDir + "/../" + Slicer3_INSTALL_LIB_DIR + "/SlicerBaseGUI/Tcl/Loader.tcl";
std::string tmpName = slicerBinDir + "/../" + Slicer_INSTALL_LIB_DIR + "/SlicerBaseGUI/Tcl/Loader.tcl";
if ( !vtksys::SystemTools::FileExists(tmpName.c_str()) )
{
// Handle Visual Studio IntDir
......@@ -422,7 +422,7 @@ int Slicer3_main(int& argc, char *argv[])
vtksys::SystemTools::SplitPath(slicerBinDir.c_str(), pathComponents);
slicerBinDir = slicerBinDir + "/..";
tmpName = slicerBinDir + "/../" + Slicer3_INSTALL_LIB_DIR + "/SlicerBaseGUI/Tcl/Loader.tcl";
tmpName = slicerBinDir + "/../" + Slicer_INSTALL_LIB_DIR + "/SlicerBaseGUI/Tcl/Loader.tcl";
if ( !vtksys::SystemTools::FileExists(tmpName.c_str()) )
{
slicerCerr("Error: Cannot find Slicer3 libraries" << endl);
......@@ -456,7 +456,7 @@ int Slicer3_main(int& argc, char *argv[])
// ITK factories dir
std::string slicerITKFactoriesDir;
slicerITKFactoriesDir = slicerHome + "/" + Slicer3_INSTALL_ITKFACTORIES_DIR;
slicerITKFactoriesDir = slicerHome + "/" + Slicer_INSTALL_ITKFACTORIES_DIR;
if (hasIntDir)
{
slicerITKFactoriesDir += "/" + intDir;
......@@ -515,8 +515,8 @@ int Slicer3_main(int& argc, char *argv[])
pythonEnv += std::string ( existingPythonEnv ) + PathSep;
}
pythonEnv += slicerHome + "/" + Slicer3_INSTALL_LIB_DIR + "/SlicerBaseGUI/Python" + PathSep;
pythonEnv += slicerHome + "/" + Slicer3_INSTALL_PLUGINS_BIN_DIR + PathSep;
pythonEnv += slicerHome + "/" + Slicer_INSTALL_LIB_DIR + "/SlicerBaseGUI/Python" + PathSep;
pythonEnv += slicerHome + "/" + Slicer_INSTALL_PLUGINS_BIN_DIR + PathSep;
vtkKWApplication::PutEnv(const_cast <char *> (pythonEnv.c_str()));
Py_Initialize();
......@@ -540,18 +540,18 @@ int Slicer3_main(int& argc, char *argv[])
pythonInitStrings.push_back(std::string("import sys;"));
pythonInitStrings.push_back(std::string("from os.path import join as j;"));
pythonInitStrings.push_back(std::string("tk = Tkinter.Tk();"));
pythonInitStrings.push_back(std::string("sys.path.append ( j('" + slicerHome + "','" + Slicer3_INSTALL_LIB_DIR + "', 'SlicerBaseGUI', 'Python')" + " );"));
pythonInitStrings.push_back(std::string("sys.path.append ( j('" + slicerHome + "','" + Slicer3_INSTALL_PLUGINS_BIN_DIR + "') );"));
pythonInitStrings.push_back(std::string("sys.path.append ( j('" + slicerHome + "','" + Slicer_INSTALL_LIB_DIR + "', 'SlicerBaseGUI', 'Python')" + " );"));
pythonInitStrings.push_back(std::string("sys.path.append ( j('" + slicerHome + "','" + Slicer_INSTALL_PLUGINS_BIN_DIR + "') );"));
/*
std::string TkinitString = "import Tkinter, sys;"
"from os.path import join as j;"
"tk = Tkinter.Tk();"
"sys.path.append ( j('"
+ slicerHome + "','" + Slicer3_INSTALL_LIB_DIR + "', 'SlicerBaseGUI', 'Python')"
+ slicerHome + "','" + Slicer_INSTALL_LIB_DIR + "', 'SlicerBaseGUI', 'Python')"
+ " );\n"
"sys.path.append ( j('"
+ slicerHome + "','" + Slicer3_INSTALL_PLUGINS_BIN_DIR
+ slicerHome + "','" + Slicer_INSTALL_PLUGINS_BIN_DIR
+ "') );\n";
*/
......@@ -693,7 +693,7 @@ int Slicer3_main(int& argc, char *argv[])
// Pass arguments to the Tcl script
tclCmd = "lappend auto_path \"" + slicerHome + "/"
Slicer3_INSTALL_LIB_DIR + "/SlicerBaseGUI/Tcl\"; ";
Slicer_INSTALL_LIB_DIR + "/SlicerBaseGUI/Tcl\"; ";
//cmd += "puts $auto_path; ";
tclCmd += "package require SlicerBaseGUITcl; ";
returnCode = Slicer3_Tcl_Eval( interp, tclCmd.c_str() );
......@@ -713,7 +713,7 @@ int Slicer3_main(int& argc, char *argv[])
std::string tclCmd;
int returnCode;
tclCmd = "wm iconbitmap . -default \""+ slicerHome + "/" + Slicer3_INSTALL_SHARE_DIR + "/Resources/slicer3.ico\"";
tclCmd = "wm iconbitmap . -default \""+ slicerHome + "/" + Slicer_INSTALL_SHARE_DIR + "/Resources/slicer3.ico\"";
returnCode = Slicer3_Tcl_Eval( interp, tclCmd.c_str() );
if ( returnCode )
{
......@@ -1124,11 +1124,11 @@ int Slicer3_main(int& argc, char *argv[])
// On Win32, *both* paths have to be there, since scripts are installed
// in the install location, and exec/libs are *automatically* installed
// in intDir.
defaultModulePaths = slicerHome + "/" + Slicer3_INSTALL_MODULES_LIB_DIR;
defaultModulePaths = slicerHome + "/" + Slicer_INSTALL_MODULES_LIB_DIR;
if (hasIntDir)
{
defaultModulePaths = defaultModulePaths + PathSep +
slicerHome + "/" + Slicer3_INSTALL_MODULES_LIB_DIR + "/" + intDir;
slicerHome + "/" + Slicer_INSTALL_MODULES_LIB_DIR + "/" + intDir;
}
// add the default modules directory (based on the slicer
......@@ -1172,11 +1172,11 @@ int Slicer3_main(int& argc, char *argv[])
// On Win32, *both* paths have to be there, since scripts are installed
// in the install location, and exec/libs are *automatically* installed
// in intDir.
defaultPluginsPaths = slicerHome + "/" + Slicer3_INSTALL_PLUGINS_BIN_DIR;
defaultPluginsPaths = slicerHome + "/" + Slicer_INSTALL_PLUGINS_BIN_DIR;
if (hasIntDir)
{
defaultPluginsPaths = defaultPluginsPaths + PathSep +
slicerHome + "/" + Slicer3_INSTALL_PLUGINS_BIN_DIR + "/" + intDir;
slicerHome + "/" + Slicer_INSTALL_PLUGINS_BIN_DIR + "/" + intDir;
}
// add the default plugins directory (based on the slicer
......@@ -1196,7 +1196,7 @@ int Slicer3_main(int& argc, char *argv[])
std::string userCachePath;
// define a default cache for module information
defaultCachePath = std::string(slicerApp->GetTemporaryDirectory()) + "/" + Slicer3_INSTALL_PLUGINS_CACHE_DIR;
defaultCachePath = std::string(slicerApp->GetTemporaryDirectory()) + "/" + Slicer_INSTALL_PLUGINS_CACHE_DIR;
if (hasIntDir)
{
defaultCachePath += "/" + intDir;
......@@ -1612,7 +1612,7 @@ int Slicer3_main(int& argc, char *argv[])
slicerApp->SplashMessage("Initializing Slicer Daemon...");
std::string tclCmd;
tclCmd = "source \"" + slicerHome + "/"
Slicer3_INSTALL_MODULES_LIB_DIR "/SlicerDaemon/Tcl/slicerd.tcl\"; slicerd_start; ";
Slicer_INSTALL_MODULES_LIB_DIR "/SlicerDaemon/Tcl/slicerd.tcl\"; slicerd_start; ";
Slicer3_Tcl_Eval(interp, tclCmd.c_str());
}
#endif
......
......@@ -21,7 +21,7 @@ PROJECT(SlicerQT)
# endif(NOT WIN32)
SET(SlicerQT_EXE_SUFFIX)
SET(SlicerQT_EXE_INSTALL ${Slicer3_INSTALL_BIN_DIR})
SET(SlicerQT_EXE_INSTALL ${Slicer_INSTALL_BIN_DIR})
IF(BUILD_SHARED_LIBS)
SET(SlicerQT_NEED_SHARED_FORWARD 1)
SET(SlicerQT_EXE_SUFFIX -real)
......@@ -52,22 +52,22 @@ IF(BUILD_SHARED_LIBS)
SET(SlicerQT_FORWARD_PATH_INSTALL
"\"../${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}\"")
# Since ModuleLogic are in Slicer3_INSTALL_MODULES_BIN_DIR, let's add it
# Since ModuleLogic are in Slicer_INSTALL_MODULES_BIN_DIR, let's add it
SET(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\" CONFIG_DIR_POST")
\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\" CONFIG_DIR_POST")
ENDIF(Slicer3_BUILD_QTLOADABLEMODULES)
#IF(Slicer3_BUILD_MODULES)
# SET(Slicer3_FORWARD_PATH_BUILD
# "${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\" CONFIG_DIR_POST")
# "${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\" CONFIG_DIR_POST")
#ENDIF(Slicer3_BUILD_MODULES)
IF(Slicer3_BUILD_CLI)
SET(SlicerQT_FORWARD_PATH_BUILD
"${SlicerQT_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}\" CONFIG_DIR_POST")
\"${Slicer3_HOME}/${Slicer_INSTALL_PLUGINS_BIN_DIR}\" CONFIG_DIR_POST")
ENDIF(Slicer3_BUILD_CLI)
ELSE(WIN32)
......@@ -90,7 +90,7 @@ IF(BUILD_SHARED_LIBS)
#\"../lib/TclTk/lib/itcl${INCR_TCL_VERSION_DOT}\",
#\"../lib/TclTk/lib/itk${INCR_TCL_VERSION_DOT}\",
SET(SlicerQT_FORWARD_PATH_INSTALL
"\"../${Slicer3_INSTALL_LIB_DIR}\", \\
"\"../${Slicer_INSTALL_LIB_DIR}\", \\
\"../lib/vtk-${VTK_MAJOR_VERSION}.${VTK_MINOR_VERSION}\", \\
\"../lib/Teem-${Teem_VERSION_MAJOR}.${Teem_VERSION_MINOR}\", \\
\"../lib/FreeSurfer\", \\
......@@ -119,33 +119,33 @@ IF(BUILD_SHARED_LIBS)
"${SlicerQT_FORWARD_PATH_INSTALL}, \\
\"../${Slicer3_INSTALL_QTLOADABLEMODULES_BIN_DIR}\"")
# Since ModuleLogic are in Slicer3_INSTALL_MODULES_BIN_DIR, let's add it
# Since ModuleLogic are in Slicer_INSTALL_MODULES_BIN_DIR, let's add it
SET(Slicer3_FORWARD_PATH_BUILD
"${Slicer3_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\"")
\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\"")
ENDIF(Slicer3_BUILD_QTLOADABLEMODULES)
#IF(Slicer3_BUILD_MODULES)
# SET(Slicer3_FORWARD_PATH_BUILD
# "${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer3_INSTALL_MODULES_BIN_DIR}\"")
# "${Slicer3_FORWARD_PATH_BUILD},\"${Slicer3_HOME}/${Slicer_INSTALL_MODULES_BIN_DIR}\"")
#ENDIF(Slicer3_BUILD_MODULES)
IF(Slicer3_BUILD_CLI)
SET(SlicerQT_FORWARD_PATH_BUILD
"${SlicerQT_FORWARD_PATH_BUILD}, \\
\"${Slicer3_HOME}/${Slicer3_INSTALL_PLUGINS_BIN_DIR}\"")
\"${Slicer3_HOME}/${Slicer_INSTALL_PLUGINS_BIN_DIR}\"")
ENDIF(Slicer3_BUILD_CLI)
ENDIF(WIN32)
# IF(Slicer3_BUILD_MODULES)
# SET(Slicer3_FORWARD_PATH_INSTALL
# "${Slicer3_FORWARD_PATH_INSTALL},\"../${Slicer3_INSTALL_MODULES_BIN_DIR}\"")
# "${Slicer3_FORWARD_PATH_INSTALL},\"../${Slicer_INSTALL_MODULES_BIN_DIR}\"")
# ENDIF(Slicer3_BUILD_MODULES)
IF(Slicer3_BUILD_CLI)
SET(SlicerQT_FORWARD_PATH_INSTALL
"${SlicerQT_FORWARD_PATH_INSTALL},\"../${Slicer3_INSTALL_PLUGINS_BIN_DIR}\"")
"${SlicerQT_FORWARD_PATH_INSTALL},\"../${Slicer_INSTALL_PLUGINS_BIN_DIR}\"")
ENDIF(Slicer3_BUILD_CLI)
ENDIF(BUILD_SHARED_LIBS)
......@@ -173,7 +173,7 @@ IF(SlicerQT_NEED_SHARED_FORWARD)
${CMAKE_CURRENT_BINARY_DIR}/${slicer_exe}-forward.c)
ADD_DEPENDENCIES(${slicer_exe} ${SlicerQT_FORWARD_EXE})
INSTALL(TARGETS ${slicer_exe}
DESTINATION ${Slicer3_INSTALL_BIN_DIR}
DESTINATION ${Slicer_INSTALL_BIN_DIR}
COMPONENT Runtime)
ENDFOREACH(slicer_exe)
ENDIF(SlicerQT_NEED_SHARED_FORWARD)
......@@ -420,9 +420,9 @@ IF(Slicer3_LIBRARY_PROPERTIES)
ENDIF(Slicer3_LIBRARY_PROPERTIES)
install(TARGETS ${lib_name}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT Development
RUNTIME DESTINATION ${Slicer_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${Slicer_INSTALL_LIB_DIR} COMPONENT Development
)
# --------------------------------------------------------------------------
......@@ -453,7 +453,7 @@ SET(dynamicHeaders
# Install
#
INSTALL(TARGETS SlicerQT${SlicerQT_EXE_SUFFIX}
DESTINATION ${Slicer3_INSTALL_BIN_DIR}
DESTINATION ${Slicer_INSTALL_BIN_DIR}
COMPONENT Runtime)
# Install headers
......@@ -461,7 +461,7 @@ INSTALL(TARGETS SlicerQT${SlicerQT_EXE_SUFFIX}
#INSTALL(FILES
# ${headers}
# ${dynamicHeaders}
# DESTINATION ${Slicer3_INSTALL_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
# DESTINATION ${Slicer_INSTALL_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
# )
# --------------------------------------------------------------------------
......
......@@ -59,13 +59,13 @@ file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
install(FILES
${files}
${CMAKE_CURRENT_BINARY_DIR}/vtkSlicerBaseGUIQtConfigure.h
DESTINATION ${Slicer3_INSTALL_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
DESTINATION ${Slicer_INSTALL_INCLUDE_DIR}/${PROJECT_NAME} COMPONENT Development
)
file(GLOB files "${CMAKE_CURRENT_SOURCE_DIR}/Resources/*.h")
install(FILES
${files}
DESTINATION ${Slicer3_INSTALL_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
DESTINATION ${Slicer_INSTALL_INCLUDE_DIR}/${PROJECT_NAME}/Resources COMPONENT Development
)
# Helper classes
......@@ -114,9 +114,9 @@ slicer3_get_persistent_property(Slicer3_Base_LIBRARIES tmp)
slicer3_set_persistent_property(Slicer3_Base_LIBRARIES ${tmp} ${lib_name})
install(TARGETS ${lib_name}
RUNTIME DESTINATION ${Slicer3_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION ${Slicer3_INSTALL_LIB_DIR} COMPONENT Development
RUNTIME DESTINATION ${Slicer_INSTALL_BIN_DIR} COMPONENT RuntimeLibraries
LIBRARY DESTINATION ${Slicer_INSTALL_LIB_DIR} COMPONENT RuntimeLibraries
ARCHIVE DESTINATION