From bfe2cdd5585088a08e0b106f135a45600cfd884f Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 20 Sep 2001 10:57:56 -0400 Subject: [PATCH] ENH: Added support for finding cable when it is built in a configuration subdirectory by MSVC. --- Modules/FindCABLE.cmake | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/Modules/FindCABLE.cmake b/Modules/FindCABLE.cmake index a2da0dbaa..a55bf6078 100644 --- a/Modules/FindCABLE.cmake +++ b/Modules/FindCABLE.cmake @@ -25,19 +25,25 @@ IF(CABLE_BUILD_DIR) INCLUDE_INTERNALS CABLE_LIBRARY_OUTPUT_PATH CABLE_EXECUTABLE_OUTPUT_PATH) - + IF(CABLE_LIBRARY_OUTPUT_PATH) 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) 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) 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) - 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) SET(CABLE_INCLUDE_DIR ${CABLE_SOURCE_DIR}