ENH: Updated for latest Cable from CVS. Old alpha version of Cable is no longer supported.
This commit is contained in:
parent
11d50284ed
commit
c83a8ac286
|
@ -23,55 +23,46 @@ IF(CABLE_BUILD_DIR)
|
||||||
EXECUTABLE_OUTPUT_PATH
|
EXECUTABLE_OUTPUT_PATH
|
||||||
MAKECOMMAND
|
MAKECOMMAND
|
||||||
INCLUDE_INTERNALS
|
INCLUDE_INTERNALS
|
||||||
CABLE_LIBRARY_OUTPUT_PATH
|
CABLE_LIBRARY_PATH
|
||||||
CABLE_EXECUTABLE_OUTPUT_PATH)
|
CABLE_EXECUTABLE_PATH)
|
||||||
|
|
||||||
IF(CABLE_LIBRARY_OUTPUT_PATH)
|
IF(CABLE_LIBRARY_PATH)
|
||||||
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES WrapTclFacility PATHS
|
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES CableTclFacility PATHS
|
||||||
${CABLE_LIBRARY_OUTPUT_PATH}
|
${CABLE_LIBRARY_PATH}
|
||||||
${CABLE_LIBRARY_OUTPUT_PATH}/*)
|
${CABLE_LIBRARY_PATH}/*)
|
||||||
ELSE(CABLE_LIBRARY_OUTPUT_PATH)
|
ELSE(CABLE_LIBRARY_PATH)
|
||||||
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES WrapTclFacility PATHS
|
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES CableTclFacility PATHS
|
||||||
${CABLE_BINARY_DIR}/WrapTclFacility
|
${CABLE_BINARY_DIR}/CableTclFacility
|
||||||
${CABLE_BINARY_DIR}/WrapTclFacility/*)
|
${CABLE_BINARY_DIR}/CableTclFacility/*)
|
||||||
ENDIF(CABLE_LIBRARY_OUTPUT_PATH)
|
ENDIF(CABLE_LIBRARY_PATH)
|
||||||
|
|
||||||
IF(CABLE_EXECUTABLE_OUTPUT_PATH)
|
IF(CABLE_EXECUTABLE_PATH)
|
||||||
FIND_PROGRAM(CABLE NAMES cable PATHS
|
FIND_PROGRAM(CABLE NAMES cable PATHS
|
||||||
${CABLE_EXECUTABLE_OUTPUT_PATH}
|
${CABLE_EXECUTABLE_PATH}
|
||||||
${CABLE_EXECUTABLE_OUTPUT_PATH}/*)
|
${CABLE_EXECUTABLE_PATH}/*)
|
||||||
ELSE(CABLE_EXECUTABLE_OUTPUT_PATH)
|
ELSE(CABLE_EXECUTABLE_PATH)
|
||||||
FIND_PROGRAM(CABLE NAMES cable PATHS
|
FIND_PROGRAM(CABLE NAMES cable PATHS
|
||||||
${CABLE_BINARY_DIR}/Executables
|
${CABLE_BINARY_DIR}/Executables
|
||||||
${CABLE_BINARY_DIR}/Executables/*)
|
${CABLE_BINARY_DIR}/Executables/*)
|
||||||
ENDIF(CABLE_EXECUTABLE_OUTPUT_PATH)
|
ENDIF(CABLE_EXECUTABLE_PATH)
|
||||||
|
|
||||||
SET(CABLE_INCLUDE_DIR ${CABLE_SOURCE_DIR}
|
FIND_PATH(CABLE_INCLUDE_DIR CableTclFacility/ctCalls.h
|
||||||
CACHE STRING "Include path for Cable headers.")
|
${CABLE_SOURCE_DIR})
|
||||||
ELSE(CABLE_BUILD_DIR)
|
ELSE(CABLE_BUILD_DIR)
|
||||||
# Use some tricks to find the cable executable relative to somewhere
|
# Find the cable executable in the path.
|
||||||
# in the system search path. CMake will collapse the relative paths
|
FIND_PROGRAM(CABLE NAMES cable)
|
||||||
# automatically.
|
|
||||||
FIND_PROGRAM(CABLE
|
|
||||||
NAMES cable
|
|
||||||
../share/Cable/bin/cable
|
|
||||||
../Cable/bin/cable
|
|
||||||
PATHS /usr/share/Cable/bin
|
|
||||||
/usr/local/share/Cable/bin
|
|
||||||
"C:/Program Files/Cable/bin"
|
|
||||||
)
|
|
||||||
|
|
||||||
# Get the path where the executable sits, but without the executable
|
# Get the path where the executable sits, but without the executable
|
||||||
# name on it.
|
# name on it.
|
||||||
GET_FILENAME_COMPONENT(CABLE_ROOT_BIN ${CABLE} PATH)
|
GET_FILENAME_COMPONENT(CABLE_ROOT_BIN ${CABLE} PATH)
|
||||||
|
|
||||||
# Find the cable include directory in a path relative to the cable
|
# Find the cable include directory in a path relative to the cable
|
||||||
# executable.
|
# executable.
|
||||||
FIND_PATH(CABLE_INCLUDE_DIR WrapTclFacility/wrapCalls.h
|
FIND_PATH(CABLE_INCLUDE_DIR CableTclFacility/ctCalls.h
|
||||||
${CABLE_ROOT_BIN}/../include)
|
${CABLE_ROOT_BIN}/../share/Cable/include)
|
||||||
|
|
||||||
# Find the WrapTclFacility library in a path relative to the cable
|
# Find the WrapTclFacility library in a path relative to the cable
|
||||||
# executable.
|
# executable.
|
||||||
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES WrapTclFacility PATHS
|
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES CableTclFacility PATHS
|
||||||
${CABLE_ROOT_BIN}/../lib)
|
${CABLE_ROOT_BIN}/../lib)
|
||||||
ENDIF(CABLE_BUILD_DIR)
|
ENDIF(CABLE_BUILD_DIR)
|
||||||
|
|
Loading…
Reference in New Issue