Lines 85-100
Link Here
|
85 |
OUTPUT_VARIABLE AVAILABLE_ITCL) |
85 |
OUTPUT_VARIABLE AVAILABLE_ITCL) |
86 |
if(AVAILABLE_ITCL) |
86 |
if(AVAILABLE_ITCL) |
87 |
execute_process( |
87 |
execute_process( |
88 |
COMMAND ${TCL_TCLSH} GetITCL_Version.tcl |
88 |
COMMAND ${TCL_TCLSH} GetITCL_Version.tcl |
89 |
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules |
89 |
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/cmake/modules |
90 |
OUTPUT_VARIABLE itcl_library_versions) |
90 |
OUTPUT_VARIABLE itcl_library_versions) |
91 |
message(STATUS "Looking for itcl.h") |
91 |
message(STATUS "Looking for itcl.h") |
92 |
find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH}) |
92 |
find_path(ITCL_INCLUDE_PATH itcl.h ${TCL_INCLUDE_PATH}) |
93 |
if(ITCL_INCLUDE_PATH) |
93 |
if(ITCL_INCLUDE_PATH) |
94 |
message(STATUS "Looking for itcl.h - found") |
94 |
message(STATUS "Looking for itcl.h - found") |
95 |
message(STATUS "Looking for itcl library") |
95 |
message(STATUS "Looking for itcl library") |
96 |
get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH) |
96 |
get_filename_component(TCL_LIBRARY_PATH ${TCL_LIBRARY} PATH) |
97 |
set(itcl_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) |
97 |
set(itcl_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0) |
98 |
foreach(version ${itcl_library_versions}) |
98 |
foreach(version ${itcl_library_versions}) |
99 |
find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH} |
99 |
find_library(ITCL_LIBRARY itcl${version} PATHS ${TCL_LIBRARY_PATH} |
100 |
PATH_SUFFIXES itcl${version}) |
100 |
PATH_SUFFIXES itcl${version}) |
Lines 132-144
Link Here
|
132 |
else(ENABLE_itcl) |
132 |
else(ENABLE_itcl) |
133 |
set(MKTCLINDEX_ARGS "-tcl") |
133 |
set(MKTCLINDEX_ARGS "-tcl") |
134 |
endif(ENABLE_itcl) |
134 |
endif(ENABLE_itcl) |
|
|
135 |
|
135 |
if(ENABLE_tk AND NOT X11_FOUND) |
136 |
if(ENABLE_tk AND NOT X11_FOUND) |
136 |
message(STATUS "WARNING: X11 not found, disabling Tk interface code") |
137 |
message(STATUS "WARNING: X11 not found, disabling Tk interface code") |
137 |
set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE) |
138 |
set(ENABLE_tk OFF CACHE BOOL "Enable Tk interface code" FORCE) |
138 |
endif(ENABLE_tk AND NOT X11_FOUND) |
139 |
endif(ENABLE_tk AND NOT X11_FOUND) |
139 |
if(ENABLE_tk) |
140 |
if(ENABLE_tk) |
|
|
141 |
get_filename_component(TK_LIBRARY_PATH ${TK_LIBRARY} PATH) |
142 |
if(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH}) |
143 |
message(STATUS "TCL_LIBRARY_PATH = ${TCL_LIBRARY_PATH}") |
144 |
message(STATUS "TK_LIBRARY_PATH = ${TK_LIBRARY_PATH}") |
145 |
message(STATUS "WARNING: the Tcl and Tk library locations are inconsistent so those libraries are likely not compatible") |
146 |
endif(NOT ${TK_LIBRARY_PATH} STREQUAL ${TCL_LIBRARY_PATH}) |
147 |
endif(ENABLE_tk) |
148 |
if(ENABLE_tk) |
140 |
set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR}) |
149 |
set(TK_INCLUDE_PATH ${TK_INCLUDE_PATH} ${X11_INCLUDE_DIR}) |
141 |
set(TK_LIBRARY ${TK_LIBRARY}) |
|
|
142 |
message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}") |
150 |
message(STATUS "TK_INCLUDE_PATH = ${TK_INCLUDE_PATH}") |
143 |
message(STATUS "TK_LIBRARY = ${TK_LIBRARY}") |
151 |
message(STATUS "TK_LIBRARY = ${TK_LIBRARY}") |
144 |
else(ENABLE_tk) |
152 |
else(ENABLE_tk) |
Lines 153-161
Link Here
|
153 |
if(ITK_INCLUDE_PATH) |
161 |
if(ITK_INCLUDE_PATH) |
154 |
message(STATUS "Looking for itk.h - found") |
162 |
message(STATUS "Looking for itk.h - found") |
155 |
message(STATUS "Looking for itk library") |
163 |
message(STATUS "Looking for itk library") |
156 |
set(itk_library_versions 3.4 3.3 3.2 3.1 3.0 2.1 2.0) |
164 |
set(itk_library_versions 4.0.0 3.4 3.3 3.2 3.1 3.0 2.1 2.0) |
157 |
foreach(version ${itk_library_versions}) |
165 |
foreach(version ${itk_library_versions}) |
158 |
find_library(ITK_LIBRARY itk${version} |
166 |
find_library(ITK_LIBRARY itk${version} PATHS ${TCL_LIBRARY_PATH} |
159 |
PATH_SUFFIXES itk${version}) |
167 |
PATH_SUFFIXES itk${version}) |
160 |
endforeach(version ${itk_library_versions}) |
168 |
endforeach(version ${itk_library_versions}) |
161 |
if(ITK_LIBRARY) |
169 |
if(ITK_LIBRARY) |