Commit 001f95bd authored by jcfr's avatar jcfr
Browse files

COMP: Rename SlicerMacroBuildModuleLibrary into SlicerMacroBuildModuleVTKLibrary

git-svn-id: http://svn.slicer.org/Slicer4/trunk@16716 3bd1e089-480b-0410-8dfb-8563597acbee
parent 6e1f52cb
...@@ -45,7 +45,7 @@ MACRO(SlicerMacroBuildModuleLogic) ...@@ -45,7 +45,7 @@ MACRO(SlicerMacroBuildModuleLogic)
qSlicerBaseQTCLI qSlicerBaseQTCLI
) )
SlicerMacroBuildModuleLibrary( SlicerMacroBuildModuleVTKLibrary(
NAME ${MODULELOGIC_NAME} NAME ${MODULELOGIC_NAME}
EXPORT_DIRECTIVE ${MODULELOGIC_EXPORT_DIRECTIVE} EXPORT_DIRECTIVE ${MODULELOGIC_EXPORT_DIRECTIVE}
SRCS ${MODULELOGIC_SRCS} SRCS ${MODULELOGIC_SRCS}
......
...@@ -34,7 +34,7 @@ MACRO(SlicerMacroBuildModuleMRML) ...@@ -34,7 +34,7 @@ MACRO(SlicerMacroBuildModuleMRML)
${Slicer_ModuleMRML_INCLUDE_DIRS} ${Slicer_ModuleMRML_INCLUDE_DIRS}
) )
SlicerMacroBuildModuleLibrary( SlicerMacroBuildModuleVTKLibrary(
NAME ${MODULEMRML_NAME} NAME ${MODULEMRML_NAME}
EXPORT_DIRECTIVE ${MODULEMRML_EXPORT_DIRECTIVE} EXPORT_DIRECTIVE ${MODULEMRML_EXPORT_DIRECTIVE}
SRCS ${MODULEMRML_SRCS} SRCS ${MODULEMRML_SRCS}
......
...@@ -19,11 +19,11 @@ ...@@ -19,11 +19,11 @@
################################################################################ ################################################################################
# #
# SlicerMacroBuildModuleLibrary # SlicerMacroBuildModuleVTKLibrary
# #
MACRO(SlicerMacroBuildModuleLibrary) MACRO(SlicerMacroBuildModuleVTKLibrary)
SLICER_PARSE_ARGUMENTS(MODULELIBRARY SLICER_PARSE_ARGUMENTS(MODULEVTKLIBRARY
"NAME;EXPORT_DIRECTIVE;SRCS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES" "NAME;EXPORT_DIRECTIVE;SRCS;INCLUDE_DIRECTORIES;TARGET_LIBRARIES"
"DISABLE_WRAP_PYTHON" "DISABLE_WRAP_PYTHON"
${ARGN} ${ARGN}
...@@ -34,7 +34,7 @@ MACRO(SlicerMacroBuildModuleLibrary) ...@@ -34,7 +34,7 @@ MACRO(SlicerMacroBuildModuleLibrary)
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
SET(expected_nonempty_vars NAME EXPORT_DIRECTIVE SRCS) SET(expected_nonempty_vars NAME EXPORT_DIRECTIVE SRCS)
FOREACH(var ${expected_nonempty_vars}) FOREACH(var ${expected_nonempty_vars})
IF("${MODULELIBRARY_${var}}" STREQUAL "") IF("${MODULEVTKLIBRARY_${var}}" STREQUAL "")
MESSAGE(FATAL_ERROR "error: ${var} CMake variable is empty !") MESSAGE(FATAL_ERROR "error: ${var} CMake variable is empty !")
ENDIF() ENDIF()
ENDFOREACH() ENDFOREACH()
...@@ -42,7 +42,7 @@ MACRO(SlicerMacroBuildModuleLibrary) ...@@ -42,7 +42,7 @@ MACRO(SlicerMacroBuildModuleLibrary)
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Define library name # Define library name
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
SET(lib_name ${MODULELIBRARY_NAME}) SET(lib_name ${MODULEVTKLIBRARY_NAME})
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Include dirs # Include dirs
...@@ -50,14 +50,14 @@ MACRO(SlicerMacroBuildModuleLibrary) ...@@ -50,14 +50,14 @@ MACRO(SlicerMacroBuildModuleLibrary)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${MODULELIBRARY_INCLUDE_DIRECTORIES} ${MODULEVTKLIBRARY_INCLUDE_DIRECTORIES}
) )
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Configure export header # Configure export header
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MODULELIBRARY_EXPORT_DIRECTIVE}) SET(MY_LIBRARY_EXPORT_DIRECTIVE ${MODULEVTKLIBRARY_EXPORT_DIRECTIVE})
SET(MY_EXPORT_HEADER_PREFIX ${MODULELIBRARY_NAME}) SET(MY_EXPORT_HEADER_PREFIX ${MODULEVTKLIBRARY_NAME})
SET(MY_LIBNAME ${lib_name}) SET(MY_LIBNAME ${lib_name})
# Sanity checks # Sanity checks
...@@ -83,22 +83,18 @@ MACRO(SlicerMacroBuildModuleLibrary) ...@@ -83,22 +83,18 @@ MACRO(SlicerMacroBuildModuleLibrary)
# Build library # Build library
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
ADD_LIBRARY(${lib_name} ADD_LIBRARY(${lib_name}
${MODULELIBRARY_SRCS} ${MODULEVTKLIBRARY_SRCS}
) )
# Set loadable modules output path # Set loadable modules output path
SET_TARGET_PROPERTIES(${lib_name} SET_TARGET_PROPERTIES(${lib_name} PROPERTIES
PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${Slicer_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR}"
RUNTIME_OUTPUT_DIRECTORY LIBRARY_OUTPUT_DIRECTORY "${Slicer_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}"
"${Slicer_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_BIN_DIR}" ARCHIVE_OUTPUT_DIRECTORY "${Slicer_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}"
LIBRARY_OUTPUT_DIRECTORY
"${Slicer_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}"
ARCHIVE_OUTPUT_DIRECTORY
"${Slicer_BINARY_DIR}/${Slicer_INSTALL_QTLOADABLEMODULES_LIB_DIR}"
) )
TARGET_LINK_LIBRARIES(${lib_name} TARGET_LINK_LIBRARIES(${lib_name}
${MODULELIBRARY_TARGET_LIBRARIES} ${MODULEVTKLIBRARY_TARGET_LIBRARIES}
) )
# Apply user-defined properties to the library target. # Apply user-defined properties to the library target.
...@@ -119,27 +115,27 @@ MACRO(SlicerMacroBuildModuleLibrary) ...@@ -119,27 +115,27 @@ MACRO(SlicerMacroBuildModuleLibrary)
# Install headers # Install headers
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
IF(DEFINED Slicer_DEVELOPMENT_INSTALL) IF(DEFINED Slicer_DEVELOPMENT_INSTALL)
IF(NOT DEFINED ${MODULELIBRARY_NAME}_DEVELOPMENT_INSTALL) IF(NOT DEFINED ${MODULEVTKLIBRARY_NAME}_DEVELOPMENT_INSTALL)
SET(${MODULELIBRARY_NAME}_DEVELOPMENT_INSTALL ${Slicer_DEVELOPMENT_INSTALL}) SET(${MODULEVTKLIBRARY_NAME}_DEVELOPMENT_INSTALL ${Slicer_DEVELOPMENT_INSTALL})
ENDIF() ENDIF()
ELSE() ELSE()
IF (NOT DEFINED ${MODULELIBRARY_NAME}_DEVELOPMENT_INSTALL) IF (NOT DEFINED ${MODULEVTKLIBRARY_NAME}_DEVELOPMENT_INSTALL)
SET(${MODULELIBRARY_NAME}_DEVELOPMENT_INSTALL OFF) SET(${MODULEVTKLIBRARY_NAME}_DEVELOPMENT_INSTALL OFF)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(${MODULELIBRARY_NAME}_DEVELOPMENT_INSTALL) IF(${MODULEVTKLIBRARY_NAME}_DEVELOPMENT_INSTALL)
FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h") FILE(GLOB headers "${CMAKE_CURRENT_SOURCE_DIR}/*.h")
INSTALL(FILES INSTALL(FILES
${headers} ${headers}
${dynamicHeaders} ${dynamicHeaders}
DESTINATION ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/${MODULELIBRARY_NAME} COMPONENT Development DESTINATION ${Slicer_INSTALL_QTLOADABLEMODULES_INCLUDE_DIR}/${MODULEVTKLIBRARY_NAME} COMPONENT Development
) )
ENDIF() ENDIF()
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
# Export target # Export target
# -------------------------------------------------------------------------- # --------------------------------------------------------------------------
SET_PROPERTY(GLOBAL APPEND PROPERTY Slicer_TARGETS ${MODULELIBRARY_NAME}) SET_PROPERTY(GLOBAL APPEND PROPERTY Slicer_TARGETS ${MODULEVTKLIBRARY_NAME})
ENDMACRO() ENDMACRO()
...@@ -521,7 +521,7 @@ ADD_SUBDIRECTORY(Resources) ...@@ -521,7 +521,7 @@ ADD_SUBDIRECTORY(Resources)
# Macro useful to build ModuleLogic and ModuleMRML libraries # Macro useful to build ModuleLogic and ModuleMRML libraries
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
INCLUDE(SlicerMacroBuildModuleLibrary) INCLUDE(SlicerMacroBuildModuleVTKLibrary)
INCLUDE(SlicerMacroPythonWrapModuleLibrary) INCLUDE(SlicerMacroPythonWrapModuleLibrary)
INCLUDE(SlicerMacroBuildModuleLogic) INCLUDE(SlicerMacroBuildModuleLogic)
INCLUDE(SlicerMacroBuildModuleMRML) INCLUDE(SlicerMacroBuildModuleMRML)
......
...@@ -60,7 +60,7 @@ endif() ...@@ -60,7 +60,7 @@ endif()
include(CMakeParseArguments) include(CMakeParseArguments)
#include(ctkMacroCompilePythonScript) #include(ctkMacroCompilePythonScript)
include(SlicerMacroParseArguments) include(SlicerMacroParseArguments)
include(SlicerMacroBuildModuleLibrary) include(SlicerMacroBuildModuleVTKLibrary)
#include(SlicerMacroPythonWrapModuleLibrary) #include(SlicerMacroPythonWrapModuleLibrary)
include(SlicerMacroBuildModuleLogic) include(SlicerMacroBuildModuleLogic)
include(SlicerMacroBuildModuleMRML) include(SlicerMacroBuildModuleMRML)
......
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