diff options
| author | Brad King <brad.king@kitware.com> | 2001-09-20 14:57:56 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-09-20 14:57:56 (GMT) |
| commit | bfe2cdd5585088a08e0b106f135a45600cfd884f (patch) | |
| tree | 49edadb07f030b96da47b804292c3f6845366e55 /Modules | |
| parent | 65ef85320a900c620f235fddc17ae2a6068ec75d (diff) | |
| download | CMake-bfe2cdd5585088a08e0b106f135a45600cfd884f.zip CMake-bfe2cdd5585088a08e0b106f135a45600cfd884f.tar.gz CMake-bfe2cdd5585088a08e0b106f135a45600cfd884f.tar.bz2 | |
ENH: Added support for finding cable when it is built in a configuration subdirectory by MSVC.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindCABLE.cmake | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/Modules/FindCABLE.cmake b/Modules/FindCABLE.cmake index a2da0db..a55bf60 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} |