Commit 45c65477 authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3_USE_BatchMake into Slicer_USE_BatchMake

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15082 3bd1e089-480b-0410-8dfb-8563597acbee
parent 549403d1
...@@ -769,9 +769,9 @@ if(Slicer3_USE_MIDAS) ...@@ -769,9 +769,9 @@ if(Slicer3_USE_MIDAS)
SET(cli_modules ${cli_modules} MIDASApplications) SET(cli_modules ${cli_modules} MIDASApplications)
endif(Slicer3_USE_MIDAS) endif(Slicer3_USE_MIDAS)
if(Slicer3_USE_BatchMake) if(Slicer_USE_BatchMake)
SET(cli_modules ${cli_modules} BatchMakeApplications) SET(cli_modules ${cli_modules} BatchMakeApplications)
endif(Slicer3_USE_BatchMake) endif(Slicer_USE_BatchMake)
#SET(cli_modules ${cli_modules} Utah) #SET(cli_modules ${cli_modules} Utah)
......
...@@ -111,7 +111,7 @@ Slicer3_BUILD_CLI:BOOL=@Slicer3_BUILD_CLI@ ...@@ -111,7 +111,7 @@ Slicer3_BUILD_CLI:BOOL=@Slicer3_BUILD_CLI@
Slicer3_BUILD_MODULES:BOOL=@Slicer3_BUILD_MODULES@ Slicer3_BUILD_MODULES:BOOL=@Slicer3_BUILD_MODULES@
Slicer3_BUILD_QTLOADABLEMODULES:BOOL=@Slicer3_BUILD_QTLOADABLEMODULES@ Slicer3_BUILD_QTLOADABLEMODULES:BOOL=@Slicer3_BUILD_QTLOADABLEMODULES@
Slicer3_BUILD_WIN32_CONSOLE:BOOL=@Slicer3_BUILD_WIN32_CONSOLE@ Slicer3_BUILD_WIN32_CONSOLE:BOOL=@Slicer3_BUILD_WIN32_CONSOLE@
Slicer3_USE_BatchMake:BOOL=@Slicer3_USE_BatchMake@ Slicer_USE_BatchMake:BOOL=@Slicer_USE_BatchMake@
Slicer3_USE_IGSTK:BOOL=@Slicer3_USE_IGSTK@ Slicer3_USE_IGSTK:BOOL=@Slicer3_USE_IGSTK@
Slicer3_USE_MIDAS:BOOL=@Slicer3_USE_MIDAS@ Slicer3_USE_MIDAS:BOOL=@Slicer3_USE_MIDAS@
Slicer3_USE_NAVITRACK:BOOL=@Slicer3_USE_NAVITRACK@ Slicer3_USE_NAVITRACK:BOOL=@Slicer3_USE_NAVITRACK@
......
...@@ -55,7 +55,7 @@ IF(Slicer3_USE_PYTHONQT_WITH_TCL) ...@@ -55,7 +55,7 @@ IF(Slicer3_USE_PYTHONQT_WITH_TCL)
ENDIF() ENDIF()
ENDIF() ENDIF()
IF(Slicer3_USE_BatchMake) IF(Slicer_USE_BatchMake)
LIST(APPEND SLICER_LIBRARY_PATHS_BUILD LIST(APPEND SLICER_LIBRARY_PATHS_BUILD
${BatchMake_DIR}/bin/${CTKAPPLAUNCHER_BUILD_TYPE} ${BatchMake_DIR}/bin/${CTKAPPLAUNCHER_BUILD_TYPE}
) )
...@@ -174,7 +174,7 @@ IF(Slicer3_USE_OPENIGTLINK) ...@@ -174,7 +174,7 @@ IF(Slicer3_USE_OPENIGTLINK)
) )
ENDIF() ENDIF()
IF(Slicer3_USE_BatchMake) IF(Slicer_USE_BatchMake)
LIST(APPEND SLICER_LIBRARY_PATHS_INSTALLED LIST(APPEND SLICER_LIBRARY_PATHS_INSTALLED
./lib/BatchMake ./lib/BatchMake
./lib/bmModuleDescriptionParser ./lib/bmModuleDescriptionParser
......
...@@ -362,8 +362,8 @@ ENDIF() ...@@ -362,8 +362,8 @@ ENDIF()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
## BatchMake ## BatchMake
option(Slicer3_USE_BatchMake "Build Slicer3 with BatchMake support." OFF) option(Slicer_USE_BatchMake "Build Slicer with BatchMake support." OFF)
IF(Slicer3_USE_BatchMake) IF(Slicer_USE_BatchMake)
find_package(BatchMake REQUIRED) find_package(BatchMake REQUIRED)
include(${BatchMake_USE_FILE}) include(${BatchMake_USE_FILE})
ENDIF() ENDIF()
......
...@@ -28,7 +28,7 @@ ENDIF(Slicer3_USE_QT) ...@@ -28,7 +28,7 @@ ENDIF(Slicer3_USE_QT)
set(Slicer3_BUILD_SHARED "@BUILD_SHARED_LIBS@") set(Slicer3_BUILD_SHARED "@BUILD_SHARED_LIBS@")
# Slicer3 options # Slicer3 options
set(Slicer3_USE_BatchMake "@Slicer3_USE_BatchMake@") set(Slicer_USE_BatchMake "@Slicer_USE_BatchMake@")
set(Slicer3_USE_MIDAS "@Slicer3_USE_MIDAS@") set(Slicer3_USE_MIDAS "@Slicer3_USE_MIDAS@")
set(Slicer3_USE_NUMPY "@Slicer3_USE_NUMPY@") set(Slicer3_USE_NUMPY "@Slicer3_USE_NUMPY@")
set(Slicer3_USE_PYTHON "@Slicer3_USE_PYTHON@") set(Slicer3_USE_PYTHON "@Slicer3_USE_PYTHON@")
......
...@@ -28,7 +28,7 @@ ENDIF(Slicer3_USE_QT) ...@@ -28,7 +28,7 @@ ENDIF(Slicer3_USE_QT)
set(Slicer3_BUILD_SHARED "@BUILD_SHARED_LIBS@") set(Slicer3_BUILD_SHARED "@BUILD_SHARED_LIBS@")
# Slicer3 options # Slicer3 options
set(Slicer3_USE_BatchMake "@Slicer3_USE_BatchMake@") set(Slicer_USE_BatchMake "@Slicer_USE_BatchMake@")
set(Slicer3_USE_IGSTK "@Slicer3_USE_IGSTK@") set(Slicer3_USE_IGSTK "@Slicer3_USE_IGSTK@")
set(Slicer3_USE_MIDAS "@Slicer3_USE_MIDAS@") set(Slicer3_USE_MIDAS "@Slicer3_USE_MIDAS@")
set(Slicer3_USE_NAVITRACK "@Slicer3_USE_NAVITRACK@") set(Slicer3_USE_NAVITRACK "@Slicer3_USE_NAVITRACK@")
......
...@@ -489,7 +489,7 @@ ExternalProject_Add(${proj} ...@@ -489,7 +489,7 @@ ExternalProject_Add(${proj}
-DSlicer3_USE_OPENIGTLINK:BOOL=ON -DSlicer3_USE_OPENIGTLINK:BOOL=ON
-DOpenIGTLink_DIR:PATH=${CMAKE_BINARY_DIR}/OpenIGTLink-build -DOpenIGTLink_DIR:PATH=${CMAKE_BINARY_DIR}/OpenIGTLink-build
# BatchMake # BatchMake
-DSlicer3_USE_BatchMake=ON -DSlicer_USE_BatchMake=ON
-DBatchMake_DIR:PATH=${CMAKE_BINARY_DIR}/BatchMake-build -DBatchMake_DIR:PATH=${CMAKE_BINARY_DIR}/BatchMake-build
# VTK # VTK
-DVTK_DIR:PATH=${VTK_DIR} -DVTK_DIR:PATH=${VTK_DIR}
......
...@@ -36,12 +36,12 @@ if(Teem_FOUND) ...@@ -36,12 +36,12 @@ if(Teem_FOUND)
include(${Teem_USE_FILE}) include(${Teem_USE_FILE})
endif(Teem_FOUND) endif(Teem_FOUND)
if(Slicer3_USE_BatchMake) if(Slicer_USE_BatchMake)
find_package(BatchMake) find_package(BatchMake)
if(BatchMake_FOUND) if(BatchMake_FOUND)
include(${BatchMake_USE_FILE}) include(${BatchMake_USE_FILE})
endif(BatchMake_FOUND) endif(BatchMake_FOUND)
endif(Slicer3_USE_BatchMake) endif(Slicer_USE_BatchMake)
# Add compiler flags needed to use Slicer3. # Add compiler flags needed to use Slicer3.
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Slicer3_REQUIRED_C_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${Slicer3_REQUIRED_C_FLAGS}")
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#define VTKSLICER_STATIC #define VTKSLICER_STATIC
#endif #endif
#cmakedefine Slicer3_USE_BatchMake #cmakedefine Slicer_USE_BatchMake
#cmakedefine Slicer3_USE_IGSTK #cmakedefine Slicer3_USE_IGSTK
#cmakedefine Slicer3_USE_MIDAS #cmakedefine Slicer3_USE_MIDAS
#cmakedefine Slicer3_USE_NAVITRACK #cmakedefine Slicer3_USE_NAVITRACK
......
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