Commit 69295f26 authored by Ken Martin's avatar Ken Martin
Browse files

now uses new USeVTK file and loaded commands

parent a2fab5f7
CMAKE_MINIMUM_REQUIRED(VERSION 1.4) CMAKE_MINIMUM_REQUIRED(VERSION 1.6)
# Set the project/library name here. Classes should be declared as # Set the project/library name here. Classes should be declared as
# "class vtkLocal_EXPORT vtkFoo", where vtkLocal is the name of the # "class vtkLocal_EXPORT vtkFoo", where vtkLocal is the name of the
...@@ -25,10 +25,9 @@ INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR}) ...@@ -25,10 +25,9 @@ INCLUDE_DIRECTORIES(${PROJECT_BINARY_DIR})
# Find and load VTK settings. # Find and load VTK settings.
INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake) INCLUDE(${CMAKE_ROOT}/Modules/FindVTK.cmake)
IF(USE_VTK_FILE) IF(VTK_FOUND)
INCLUDE(${USE_VTK_FILE}) INCLUDE(${VTK_USE_FILE})
SET(VTK_FOUND 1) ENDIF(VTK_FOUND)
ENDIF(USE_VTK_FILE)
# Give user option of building shared or static libraries. Default to # Give user option of building shared or static libraries. Default to
# the choice made for VTK. # the choice made for VTK.
...@@ -72,11 +71,11 @@ IF(VTK_FOUND) ...@@ -72,11 +71,11 @@ IF(VTK_FOUND)
# Create the instantiator for these classes. # Create the instantiator for these classes.
SET(VTK_USE_INSTANTIATOR_NEW 1) SET(VTK_USE_INSTANTIATOR_NEW 1)
VTK_MAKE_INSTANTIATOR("${PROJECT_NAME}Instantiator" vtkLocalInstantiator_SRCS VTK_MAKE_INSTANTIATOR2("${PROJECT_NAME}Instantiator" vtkLocalInstantiator_SRCS
${vtkLocal_SRCS} ${vtkLocal_SRCS}
EXPORT_MACRO "VTK_${PROJECT_NAME}_EXPORT" EXPORT_MACRO "VTK_${PROJECT_NAME}_EXPORT"
HEADER_LOCATION ${PROJECT_BINARY_DIR} HEADER_LOCATION ${PROJECT_BINARY_DIR}
INCLUDES "${PROJECT_NAME}Configure.h") INCLUDES "${PROJECT_NAME}Configure.h")
# Create the library. # Create the library.
ADD_LIBRARY(${PROJECT_NAME} ${vtkLocal_SRCS} ${vtkLocalInstantiator_SRCS}) ADD_LIBRARY(${PROJECT_NAME} ${vtkLocal_SRCS} ${vtkLocalInstantiator_SRCS})
...@@ -84,7 +83,7 @@ IF(VTK_FOUND) ...@@ -84,7 +83,7 @@ IF(VTK_FOUND)
# Create Tcl wrappers if VTK is wrapped in Tcl. # Create Tcl wrappers if VTK is wrapped in Tcl.
IF(VTK_WRAP_TCL) IF(VTK_WRAP_TCL)
VTK_WRAP_TCL(${PROJECT_NAME}TCL vtkLocalTCL_SRCS ${vtkLocal_SRCS}) VTK_WRAP_TCL2(${PROJECT_NAME}TCL vtkLocalTCL_SRCS ${vtkLocal_SRCS})
ADD_LIBRARY(${PROJECT_NAME}TCL ${vtkLocalTCL_SRCS}) ADD_LIBRARY(${PROJECT_NAME}TCL ${vtkLocalTCL_SRCS})
TARGET_LINK_LIBRARIES(${PROJECT_NAME}TCL vtkCommonTCL ${PROJECT_NAME}) TARGET_LINK_LIBRARIES(${PROJECT_NAME}TCL vtkCommonTCL ${PROJECT_NAME})
...@@ -115,7 +114,7 @@ IF(VTK_FOUND) ...@@ -115,7 +114,7 @@ IF(VTK_FOUND)
# Create Python wrappers if VTK is wrapped in Python. # Create Python wrappers if VTK is wrapped in Python.
IF(VTK_WRAP_PYTHON) IF(VTK_WRAP_PYTHON)
VTK_WRAP_PYTHON(${PROJECT_NAME}Python vtkLocalPYTHON_SRCS ${vtkLocal_SRCS}) VTK_WRAP_PYTHON2(${PROJECT_NAME}Python vtkLocalPYTHON_SRCS ${vtkLocal_SRCS})
ADD_LIBRARY(${PROJECT_NAME}Python MODULE ${vtkLocalPYTHON_SRCS}) ADD_LIBRARY(${PROJECT_NAME}Python MODULE ${vtkLocalPYTHON_SRCS})
TARGET_LINK_LIBRARIES(${PROJECT_NAME}Python vtkCommonPython ${PROJECT_NAME}) TARGET_LINK_LIBRARIES(${PROJECT_NAME}Python vtkCommonPython ${PROJECT_NAME})
ENDIF(VTK_WRAP_PYTHON) ENDIF(VTK_WRAP_PYTHON)
...@@ -125,7 +124,7 @@ IF(VTK_FOUND) ...@@ -125,7 +124,7 @@ IF(VTK_FOUND)
SET(VTK_WRAP_HINTS "${PROJECT_SOURCE_DIR}/hints") SET(VTK_WRAP_HINTS "${PROJECT_SOURCE_DIR}/hints")
SET(VTK_JAVA_HOME ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME}) SET(VTK_JAVA_HOME ${PROJECT_BINARY_DIR}/java/${PROJECT_NAME})
MAKE_DIRECTORY(${VTK_JAVA_HOME}) MAKE_DIRECTORY(${VTK_JAVA_HOME})
VTK_WRAP_JAVA(${PROJECT_NAME}Java vtkLocalJAVA_SRCS ${vtkLocal_SRCS}) VTK_WRAP_JAVA2(${PROJECT_NAME}Java vtkLocalJAVA_SRCS ${vtkLocal_SRCS})
ADD_LIBRARY(${PROJECT_NAME}Java ${vtkLocalJAVA_SRCS}) ADD_LIBRARY(${PROJECT_NAME}Java ${vtkLocalJAVA_SRCS})
TARGET_LINK_LIBRARIES(${PROJECT_NAME}Java vtkCommonJava ${PROJECT_NAME}) TARGET_LINK_LIBRARIES(${PROJECT_NAME}Java vtkCommonJava ${PROJECT_NAME})
ENDIF(VTK_WRAP_JAVA) ENDIF(VTK_WRAP_JAVA)
......
Supports Markdown
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