Commit 77cb9825 authored by barre's avatar barre
Browse files

ENH: important workaround to allow people to use an installed Slicer3 to build...

ENH: important workaround to allow people to use an installed Slicer3 to build modules, even with a different generator or a compiler installed at a different location; it still has to be the same compiler version. Win32.

git-svn-id: http://svn.slicer.org/Slicer4/trunk@6860 3bd1e089-480b-0410-8dfb-8563597acbee
parent 882ca155
...@@ -124,6 +124,15 @@ endif(Slicer3_BUILD_TESTING) ...@@ -124,6 +124,15 @@ endif(Slicer3_BUILD_TESTING)
# - KWWidgets (pulls in VTK) # - KWWidgets (pulls in VTK)
# #
# Relax some constraints related to the build settings file. This was
# preventing people from using the same compiler but with a different generator,
# or just the same compiler installed in a non-standard location.
set(SKIP_KWWidgets_BUILD_SETTINGS_FILE 1)
set(SKIP_VTK_BUILD_SETTINGS_FILE 1)
set(SKIP_ITK_BUILD_SETTINGS_FILE 1)
set(SKIP_TEEM_BUILD_SETTINGS_FILE 1)
## Python ## Python
option(Slicer3_USE_PYTHON "Integrate a python interpreter into Slicer." OFF) option(Slicer3_USE_PYTHON "Integrate a python interpreter into Slicer." OFF)
if(Slicer3_USE_PYTHON) if(Slicer3_USE_PYTHON)
...@@ -196,6 +205,19 @@ if(Slicer3_USE_IGSTK) ...@@ -196,6 +205,19 @@ if(Slicer3_USE_IGSTK)
include(${IGSTK_USE_FILE}) include(${IGSTK_USE_FILE})
endif(Slicer3_USE_IGSTK) endif(Slicer3_USE_IGSTK)
#-----------------------------------------------------------------------------
# Need some Tcl/Tk info
include("${VTK_CMAKE_DIR}/vtkTclTkMacros.cmake")
VTK_GET_TCL_TK_VERSION(TCL_TK_MAJOR_VERSION TCL_TK_MINOR_VERSION)
set(TCL_TK_VERSION_DOT "${TCL_TK_MAJOR_VERSION}.${TCL_TK_MINOR_VERSION}")
set(TCL_TK_VERSION "${TCL_TK_MAJOR_VERSION}${TCL_TK_MINOR_VERSION}")
include("${KWWidgets_CMAKE_DIR}/KWWidgetsTclTkMacros.cmake")
incr_tcl_get_version(INCR_TCL_MAJOR_VERSION INCR_TCL_MINOR_VERSION)
set(INCR_TCL_VERSION_DOT "${INCR_TCL_MAJOR_VERSION}.${INCR_TCL_MINOR_VERSION}")
set(INCR_TCL_VERSION "${INCR_TCL_MAJOR_VERSION}${INCR_TCL_MINOR_VERSION}")
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Generate the default setup paths scripts. # Generate the default setup paths scripts.
# Generate some useful scripts that can be used to setup various environment # Generate some useful scripts that can be used to setup various environment
......
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