Commit cf302914 authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3_USE_NUMPY into Slicer_USE_NUMPY

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15100 3bd1e089-480b-0410-8dfb-8563597acbee
parent 7c073ca7
......@@ -24,9 +24,9 @@ endif(WIN32)
# --------------------------------------------------------------------------
# Numpy?
option(Slicer3_USE_NUMPY "Enable Numpy/Scipy support in Python" OFF)
option(Slicer_USE_NUMPY "Enable Numpy/Scipy support in Python" OFF)
if(Slicer3_USE_NUMPY)
if(Slicer_USE_NUMPY)
find_path(PYTHON_NUMPY arrayobject.h
PATHS
${PYTHON_INCLUDE_PATH}
......@@ -47,16 +47,16 @@ if(Slicer3_USE_NUMPY)
DOC "Path to arrayobject.h for numpy module"
NO_SYSTEM_ENVIRONMENT_PATH
)
endif(Slicer3_USE_NUMPY)
endif(Slicer_USE_NUMPY)
if(Slicer3_USE_NUMPY)
if(Slicer_USE_NUMPY)
include_directories(
${PYTHON_NUMPY}
${PYTHON_NUMPY}/../
${PYTHON_NUMPY}/../../../numarray/numpy
${PYTHON_NUMPY}/include/numpy
)
endif(Slicer3_USE_NUMPY)
endif(Slicer_USE_NUMPY)
# --------------------------------------------------------------------------
......
......@@ -24,12 +24,12 @@
#include <Python.h>
#endif
#ifdef Slicer3_USE_NUMPY
#ifdef Slicer_USE_NUMPY
#include "arrayobject.h"
#endif
#ifdef Slicer3_USE_NUMPY
#ifdef Slicer_USE_NUMPY
static NPY_TYPES getNumpyDataTypeFromVTKDataType( int dataType, bool& success )
{
......
......@@ -622,7 +622,7 @@ add_subdirectory(Resources)
# include paths or libraries they need, but use Slicer3_*_LIBRARIES and
# Slicer3_*_INCLUDE_DIRS instead. As far as modules are concerned, both
# variables are actually set automatically by the import script when building
# against a Slicer3 build or installed tree. When in-source, we need to
# against a Slicer build or installed tree. When in-source, we need to
# set both variables now. Retrieve them from the persistent property cache
# since they were collected in each subdir (which makes it impossible to
# use normal variables, since a new scope is created in each subdir).
......@@ -663,9 +663,9 @@ ENDIF()
#-----------------------------------------------------------------------------
# Modules and CLI
#
option(Slicer_BUILD_CLI "Build Slicer3 CLI Plugins" ON)
option(Slicer_BUILD_CLI "Build Slicer CLI Plugins" ON)
IF(Slicer_USE_KWWIDGETS)
option(Slicer_BUILD_MODULES "Build Slicer3 Modules" ON)
option(Slicer_BUILD_MODULES "Build Slicer Modules" ON)
ENDIF()
include("${Slicer_CMAKE_DIR}/Slicer3PluginsMacros.cmake")
......@@ -825,7 +825,7 @@ add_subdirectory(Utilities/Package)
#-----------------------------------------------------------------------------
# Documentation
#
option(BUILD_DOCUMENTATION "Build Slicer3 Documentation" OFF)
option(BUILD_DOCUMENTATION "Build Slicer Documentation" OFF)
IF(BUILD_DOCUMENTATION)
add_subdirectory(Utilities/Doxygen)
ENDIF()
......@@ -839,7 +839,7 @@ CONFIGURE_FILE(
)
#-----------------------------------------------------------------------------
# Set up for building against a Slicer3 build tree and a Slicer3 installation
# Set up for building against a Slicer build tree and a Slicer installation
#
include(${Slicer3_SOURCE_DIR}/GenerateSlicer3Config.cmake)
......
......@@ -30,7 +30,7 @@ set(Slicer3_BUILD_SHARED "@BUILD_SHARED_LIBS@")
# Slicer3 options
set(Slicer_USE_BatchMake "@Slicer_USE_BatchMake@")
set(Slicer_USE_MIDAS "@Slicer_USE_MIDAS@")
set(Slicer3_USE_NUMPY "@Slicer3_USE_NUMPY@")
set(Slicer_USE_NUMPY "@Slicer_USE_NUMPY@")
set(Slicer_USE_PYTHON "@Slicer_USE_PYTHON@")
set(Slicer_USE_OPENCV "@Slicer_USE_OPENCV@")
......
......@@ -32,7 +32,7 @@ set(Slicer_USE_BatchMake "@Slicer_USE_BatchMake@")
set(Slicer3_USE_IGSTK "@Slicer3_USE_IGSTK@")
set(Slicer_USE_MIDAS "@Slicer_USE_MIDAS@")
set(Slicer3_USE_NAVITRACK "@Slicer3_USE_NAVITRACK@")
set(Slicer3_USE_NUMPY "@Slicer3_USE_NUMPY@")
set(Slicer_USE_NUMPY "@Slicer_USE_NUMPY@")
set(Slicer_USE_PYTHON "@Slicer_USE_PYTHON@")
set(Slicer3_USE_OPENTRACKER "@Slicer3_USE_OPENTRACKER@")
......
......@@ -505,7 +505,7 @@ ExternalProject_Add(${proj}
-DSlicer_USE_PYTHONQT:BOOL=${Slicer_USE_PYTHONQT}
-DSlicer_USE_PYTHONQT_WITH_TCL:BOOL=${Slicer_USE_PYTHONQT_WITH_TCL}
-DSlicer3_USE_SYSTEM_PYTHON:BOOL=OFF
-DSlicer3_USE_NUMPY:BOOL=${Slicer_BUILD_NUMPY}
-DSlicer_USE_NUMPY:BOOL=${Slicer_BUILD_NUMPY}
-DPYTHON_EXECUTABLE:FILEPATH=${slicer_PYTHON_EXECUTABLE}
-DPYTHON_INCLUDE_DIR:PATH=${slicer_PYTHON_INCLUDE}
-DPYTHON_LIBRARY:FILEPATH=${slicer_PYTHON_LIBRARY}
......
IF(Slicer3_USE_NUMPY AND PYTHON_EXECUTABLE)
IF(Slicer_USE_NUMPY AND PYTHON_EXECUTABLE)
ADD_TEST(Slicer3PythonSimpleNUMPYTest ${Slicer3_BINARY_DIR}/Slicer3 --launch ${PYTHON_EXECUTABLE} ${Slicer3_SOURCE_DIR}/Testing/SimpleNUMPYTest.py)
ENDIF(Slicer3_USE_NUMPY AND PYTHON_EXECUTABLE)
ENDIF(Slicer_USE_NUMPY AND PYTHON_EXECUTABLE)
......@@ -23,7 +23,7 @@
#cmakedefine Slicer3_USE_IGSTK
#cmakedefine Slicer_USE_MIDAS
#cmakedefine Slicer3_USE_NAVITRACK
#cmakedefine Slicer3_USE_NUMPY
#cmakedefine Slicer_USE_NUMPY
#cmakedefine Slicer_USE_PYTHON
#cmakedefine Slicer_USE_PYTHONQT
#cmakedefine Slicer_USE_PYTHONQT_WITH_TCL
......
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