Commit 54b11078 authored by jcfr's avatar jcfr
Browse files

COMP: Rename Slicer3_USE_OPENIGTLINK into Slicer_USE_OPENIGTLINK

git-svn-id: http://svn.slicer.org/Slicer4/trunk@15084 3bd1e089-480b-0410-8dfb-8563597acbee
parent 4dfd71d8
...@@ -61,7 +61,7 @@ IF(Slicer_USE_BatchMake) ...@@ -61,7 +61,7 @@ IF(Slicer_USE_BatchMake)
) )
ENDIF() ENDIF()
IF(Slicer3_USE_OPENIGTLINK) IF(Slicer_USE_OPENIGTLINK)
LIST(APPEND SLICER_LIBRARY_PATHS_BUILD LIST(APPEND SLICER_LIBRARY_PATHS_BUILD
${OpenIGTLink_DIR} ${OpenIGTLink_DIR}
${OpenIGTLink_DIR}/bin/${CTKAPPLAUNCHER_BUILD_TYPE} ${OpenIGTLink_DIR}/bin/${CTKAPPLAUNCHER_BUILD_TYPE}
...@@ -165,7 +165,7 @@ SET(SLICER_LIBRARY_PATHS_INSTALLED ...@@ -165,7 +165,7 @@ SET(SLICER_LIBRARY_PATHS_INSTALLED
./lib/ctk-${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION} ./lib/ctk-${CTK_MAJOR_VERSION}.${CTK_MINOR_VERSION}
) )
IF(Slicer3_USE_OPENIGTLINK) IF(Slicer_USE_OPENIGTLINK)
LIST(APPEND SLICER_LIBRARY_PATHS_INSTALLED LIST(APPEND SLICER_LIBRARY_PATHS_INSTALLED
# Slicer Libs # Slicer Libs
./lib/IGT ./lib/IGT
......
...@@ -374,8 +374,8 @@ option(Slicer_USE_MIDAS "Build Slicer with MIDAS support." OFF) ...@@ -374,8 +374,8 @@ option(Slicer_USE_MIDAS "Build Slicer with MIDAS support." OFF)
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
## OpenIGTLink (Built in Slicer3-lib) ## OpenIGTLink (Built in Slicer3-lib)
option(Slicer3_USE_OPENIGTLINK "Build Slicer3 with OpenIGTLink support." OFF) option(Slicer_USE_OPENIGTLINK "Build Slicer with OpenIGTLink support." OFF)
IF(Slicer3_USE_OPENIGTLINK) IF(Slicer_USE_OPENIGTLINK)
find_package(OpenIGTLink REQUIRED) find_package(OpenIGTLink REQUIRED)
include(${OpenIGTLink_USE_FILE}) include(${OpenIGTLink_USE_FILE})
ENDIF() ENDIF()
......
...@@ -86,7 +86,7 @@ SET(modules ...@@ -86,7 +86,7 @@ SET(modules
IGTToolSelector IGTToolSelector
) )
if(Slicer3_USE_OPENIGTLINK) if(Slicer_USE_OPENIGTLINK)
SET(modules SET(modules
${modules} ${modules}
OpenIGTLinkIF OpenIGTLinkIF
...@@ -96,7 +96,7 @@ if(Slicer3_USE_OPENIGTLINK) ...@@ -96,7 +96,7 @@ if(Slicer3_USE_OPENIGTLINK)
# IGTNavigation # IGTNavigation
# OpenCV # OpenCV
) )
endif(Slicer3_USE_OPENIGTLINK) endif(Slicer_USE_OPENIGTLINK)
FOREACH(module ${modules}) FOREACH(module ${modules})
ADD_SUBDIRECTORY(${module}) ADD_SUBDIRECTORY(${module})
......
...@@ -486,7 +486,7 @@ ExternalProject_Add(${proj} ...@@ -486,7 +486,7 @@ ExternalProject_Add(${proj}
# Teem # Teem
-DTeem_DIR:PATH=${CMAKE_BINARY_DIR}/teem-build -DTeem_DIR:PATH=${CMAKE_BINARY_DIR}/teem-build
# OpenIGTLink # OpenIGTLink
-DSlicer3_USE_OPENIGTLINK:BOOL=ON -DSlicer_USE_OPENIGTLINK:BOOL=ON
-DOpenIGTLink_DIR:PATH=${CMAKE_BINARY_DIR}/OpenIGTLink-build -DOpenIGTLink_DIR:PATH=${CMAKE_BINARY_DIR}/OpenIGTLink-build
# BatchMake # BatchMake
-DSlicer_USE_BatchMake=ON -DSlicer_USE_BatchMake=ON
......
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