瀏覽代碼

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

Brad King 24 年之前
父節點
當前提交
bfe2cdd558
共有 1 個文件被更改,包括 11 次插入5 次删除
  1. 11 5
      Modules/FindCABLE.cmake

+ 11 - 5
Modules/FindCABLE.cmake

@@ -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}