Commit 41a36b61 authored by jcfr's avatar jcfr

COMP: Rename SlicerMacroPythonWrapModuleLibrary into SlicerMacroPythonWrapModuleVTKLibrary

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16717 3bd1e089-480b-0410-8dfb-8563597acbee
parent 001f95bd
......@@ -73,7 +73,7 @@ MACRO(SlicerMacroBuildModuleLogic)
SlicerBaseLogicPythonD
)
SlicerMacroPythonWrapModuleLibrary(
SlicerMacroPythonWrapModuleVTKLibrary(
NAME ${MODULELOGIC_NAME}
SRCS ${MODULELOGIC_SRCS}
WRAPPED_TARGET_LIBRARIES ${Slicer_Wrapped_LIBRARIES}
......
......@@ -61,7 +61,7 @@ MACRO(SlicerMacroBuildModuleMRML)
SET(Slicer_Wrapped_LIBRARIES
)
SlicerMacroPythonWrapModuleLibrary(
SlicerMacroPythonWrapModuleVTKLibrary(
NAME ${MODULEMRML_NAME}
SRCS ${MODULEMRML_SRCS}
WRAPPED_TARGET_LIBRARIES ${Slicer_Wrapped_LIBRARIES}
......
......@@ -20,11 +20,11 @@
################################################################################
#
# SlicerMacroPythonWrapModuleLibrary
# SlicerMacroPythonWrapModuleVTKLibrary
#
MACRO(SlicerMacroPythonWrapModuleLibrary)
SLICER_PARSE_ARGUMENTS(PYTHONWRAPMODULELIBRARY
MACRO(SlicerMacroPythonWrapModuleVTKLibrary)
SLICER_PARSE_ARGUMENTS(PYTHONWRAPMODULEVTKLIBRARY
"NAME;SRCS;WRAPPED_TARGET_LIBRARIES;RELATIVE_PYTHON_DIR"
""
${ARGN}
......@@ -42,7 +42,7 @@ MACRO(SlicerMacroPythonWrapModuleLibrary)
SET(expected_nonempty_vars NAME SRCS)
FOREACH(var ${expected_nonempty_vars})
IF("${MODULELIBRARY_${var}}" STREQUAL "")
IF("${PYTHONWRAPMODULEVTKLIBRARY_${var}}" STREQUAL "")
MESSAGE(FATAL_ERROR "error: ${var} CMake variable is empty !")
ENDIF()
ENDFOREACH()
......@@ -57,22 +57,22 @@ MACRO(SlicerMacroPythonWrapModuleLibrary)
LIST(APPEND Slicer_Libs_VTK_PYTHON_WRAPPED_LIBRARIES ${lib}PythonD)
ENDFOREACH()
SET(PYTHONWRAPMODULELIBRARY_Wrapped_LIBRARIES
SET(PYTHONWRAPMODULEVTKLIBRARY_Wrapped_LIBRARIES
${VTK_PYTHON_WRAPPED_LIBRARIES}
${Slicer_Libs_VTK_PYTHON_WRAPPED_LIBRARIES}
${PYTHONWRAPMODULELIBRARY_WRAPPED_TARGET_LIBRARIES}
${PYTHONWRAPMODULEVTKLIBRARY_WRAPPED_TARGET_LIBRARIES}
)
vtkMacroKitPythonWrap(
KIT_NAME ${PYTHONWRAPMODULELIBRARY_NAME}
KIT_SRCS ${PYTHONWRAPMODULELIBRARY_SRCS}
KIT_NAME ${PYTHONWRAPMODULEVTKLIBRARY_NAME}
KIT_SRCS ${PYTHONWRAPMODULEVTKLIBRARY_SRCS}
KIT_INSTALL_BIN_DIR ${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR}
KIT_INSTALL_LIB_DIR ${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}
KIT_PYTHON_LIBRARIES ${PYTHONWRAPMODULELIBRARY_Wrapped_LIBRARIES}
KIT_PYTHON_LIBRARIES ${PYTHONWRAPMODULEVTKLIBRARY_Wrapped_LIBRARIES}
)
# Generate "Python/<lib_name>.py" file
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Python/${PYTHONWRAPMODULELIBRARY_RELATIVE_PYTHON_DIR}/${lib_name}.py "
FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/Python/${PYTHONWRAPMODULEVTKLIBRARY_RELATIVE_PYTHON_DIR}/${lib_name}.py "
\"\"\" This module loads all the classes from the ${lib_name} library into its
namespace.\"\"\"
......@@ -81,7 +81,7 @@ from ${lib_name}Python import *
FILE(GLOB PYFILES
RELATIVE "${CMAKE_CURRENT_BINARY_DIR}/Python"
"${CMAKE_CURRENT_BINARY_DIR}/Python/${PYTHONWRAPMODULELIBRARY_RELATIVE_PYTHON_DIR}/*.py")
"${CMAKE_CURRENT_BINARY_DIR}/Python/${PYTHONWRAPMODULEVTKLIBRARY_RELATIVE_PYTHON_DIR}/*.py")
if ( PYFILES )
ctkMacroCompilePythonScript(
TARGET_NAME ${lib_name}
......
......@@ -522,7 +522,7 @@ ADD_SUBDIRECTORY(Resources)
#-----------------------------------------------------------------------------
INCLUDE(SlicerMacroBuildModuleVTKLibrary)
INCLUDE(SlicerMacroPythonWrapModuleLibrary)
INCLUDE(SlicerMacroPythonWrapModuleVTKLibrary)
INCLUDE(SlicerMacroBuildModuleLogic)
INCLUDE(SlicerMacroBuildModuleMRML)
......
......@@ -61,7 +61,7 @@ include(CMakeParseArguments)
#include(ctkMacroCompilePythonScript)
include(SlicerMacroParseArguments)
include(SlicerMacroBuildModuleVTKLibrary)
#include(SlicerMacroPythonWrapModuleLibrary)
#include(SlicerMacroPythonWrapModuleVTKLibrary)
include(SlicerMacroBuildModuleLogic)
include(SlicerMacroBuildModuleMRML)
include(SlicerMacroBuildQtModule)
......
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