ENH: Added support for finding cable when it is built in a configuration subdirectory by MSVC.

This commit is contained in:
Brad King 2001-09-20 10:57:56 -04:00
parent 65ef85320a
commit bfe2cdd558
1 changed files with 11 additions and 5 deletions

View File

@ -25,19 +25,25 @@ IF(CABLE_BUILD_DIR)
INCLUDE_INTERNALS INCLUDE_INTERNALS
CABLE_LIBRARY_OUTPUT_PATH CABLE_LIBRARY_OUTPUT_PATH
CABLE_EXECUTABLE_OUTPUT_PATH) CABLE_EXECUTABLE_OUTPUT_PATH)
IF(CABLE_LIBRARY_OUTPUT_PATH) IF(CABLE_LIBRARY_OUTPUT_PATH)
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES WrapTclFacility PATHS FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES WrapTclFacility PATHS
${CABLE_LIBRARY_OUTPUT_PATH}) ${CABLE_LIBRARY_OUTPUT_PATH}
${CABLE_LIBRARY_OUTPUT_PATH}/*)
ELSE(CABLE_LIBRARY_OUTPUT_PATH) ELSE(CABLE_LIBRARY_OUTPUT_PATH)
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES WrapTclFacility PATHS FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES WrapTclFacility PATHS
${CABLE_BINARY_DIR}/WrapTclFacility) ${CABLE_BINARY_DIR}/WrapTclFacility
${CABLE_BINARY_DIR}/WrapTclFacility/*)
ENDIF(CABLE_LIBRARY_OUTPUT_PATH) ENDIF(CABLE_LIBRARY_OUTPUT_PATH)
IF(CABLE_EXECUTABLE_OUTPUT_PATH) IF(CABLE_EXECUTABLE_OUTPUT_PATH)
FIND_PROGRAM(CABLE NAMES cable PATHS ${CABLE_EXECUTABLE_OUTPUT_PATH}) FIND_PROGRAM(CABLE NAMES cable PATHS
${CABLE_EXECUTABLE_OUTPUT_PATH}
${CABLE_EXECUTABLE_OUTPUT_PATH}/*)
ELSE(CABLE_EXECUTABLE_OUTPUT_PATH) ELSE(CABLE_EXECUTABLE_OUTPUT_PATH)
FIND_PROGRAM(CABLE NAMES cable PATHS ${CABLE_BINARY_DIR}/Executables) FIND_PROGRAM(CABLE NAMES cable PATHS
${CABLE_BINARY_DIR}/Executables
${CABLE_BINARY_DIR}/Executables/*)
ENDIF(CABLE_EXECUTABLE_OUTPUT_PATH) ENDIF(CABLE_EXECUTABLE_OUTPUT_PATH)
SET(CABLE_INCLUDE_DIR ${CABLE_SOURCE_DIR} SET(CABLE_INCLUDE_DIR ${CABLE_SOURCE_DIR}