Commit 9ca10bef authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot

Merge topic 'smtk-libdir-setting'

fe384399 cmb: tell CMB where smtk's plugins live
de14da46 smtk: install plugins in a known directory
e875916e smtk: fix typo
Acked-by: Kitware Robot's avatarKitware Robot <kwrobot@kitware.com>
Merge-request: !39
parents d770dea3 fe384399
......@@ -33,6 +33,6 @@ execute_process(
#okay the plugin is fixed up, now we need to install it into paraviews bundle
file(GLOB fixedUpLibs "${TMP_DIR}/SMTKPlugin/*")
foreach(lib ${fixedUpLibs})
message(STATUS "instaling plugin: ${lib}")
message(STATUS "Installing plugin: ${lib}")
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${lib} ${plugin_install_dir})
endforeach()
\ No newline at end of file
endforeach()
......@@ -19,6 +19,7 @@ add_external_project_or_just_build_dependencies(cmb
-DSMTK_DIR:PATH=${smtk_dir}
-DVTK_DIR:PATH=${vtk_dir}
-DMoleQueue_DIR:PATH=<INSTALL_DIR>
-DCMB_TEST_PLUGIN_PATHS:STRING=<INSTALL_DIR>/${smtk_libdir}
#specify semi-colon separated paths for session plugins
-DCMB_TEST_PLUGIN_PATHS:STRING=<INSTALL_DIR>/lib
......
......@@ -12,6 +12,11 @@ if (WIN32)
list(APPEND extra_cmake_args "-DSMTK_PYTHON_MODULEDIR:PATH=${SuperBuild_BINARY_DIR}/install/python")
endif()
set(smtk_libdir lib)
if (WIN32)
set(smtk_libdir bin)
endif ()
add_external_project_or_just_build_dependencies(smtk
DEPENDS boost qt shiboken paraview remus
CMAKE_ARGS
......@@ -27,6 +32,7 @@ add_external_project_or_just_build_dependencies(smtk
-DSMTK_ENABLE_REMOTE_SESSION:BOOL=ON
-DSMTK_ENABLE_REMUS_SUPPORT:BOOL=ON
-DSMTK_ENABLE_PYTHON_WRAPPING:BOOL=${shiboken_ENABLED}
-DCMAKE_INSTALL_LIBDIR:STRING=${smtk_libdir}
-DParaView_DIR:PATH=${paraview_dir}
-DBOOST_INCLUDEDIR:PATH=<INSTALL_DIR>/include/boost
......
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