diff options
| author | Brad King <brad.king@kitware.com> | 2001-08-29 21:08:49 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2001-08-29 21:08:49 (GMT) |
| commit | f1e2a7062b64cb37d4903ba0f832e32a02bf4948 (patch) | |
| tree | b447426f0188b151f8dd0719e80d09baeb860de8 | |
| parent | 08a89bd8dc87fb904d10a0b1718e7c61da725c12 (diff) | |
| download | CMake-f1e2a7062b64cb37d4903ba0f832e32a02bf4948.zip CMake-f1e2a7062b64cb37d4903ba0f832e32a02bf4948.tar.gz CMake-f1e2a7062b64cb37d4903ba0f832e32a02bf4948.tar.bz2 | |
ENH: Updated library finding code to handle new cable installation directory structure. It now uses separate directories for CxxTypes and WrapTclFacility headers.
| -rw-r--r-- | Modules/FindCABLE.cmake | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Modules/FindCABLE.cmake b/Modules/FindCABLE.cmake index 29dec46..7d93b81 100644 --- a/Modules/FindCABLE.cmake +++ b/Modules/FindCABLE.cmake @@ -4,10 +4,10 @@ # # CABLE = the full path to the cable executable # CABLE_TCL_LIBRARY = the full path to the Tcl wrapper facility library -# CABLE_ROOT = the full path to the root of the cable installation +# CABLE_INCLUDE_DIR = the full path to the cable include directory # # To build Tcl wrappers, you should add shared library and link it to -# ${CABLE_TCL_LIBRARY}. You should also add ${CABLE_ROOT}/include as +# ${CABLE_TCL_LIBRARY}. You should also add ${CABLE_INCLUDE_DIR} as # an include directory. # @@ -27,10 +27,12 @@ FIND_PROGRAM(CABLE # name on it. GET_FILENAME_COMPONENT(CABLE_ROOT_BIN ${CABLE} PATH) -# Find the root of the CABLE installation based on the executable's -# location. -FIND_PATH(CABLE_ROOT include/wrapCalls.h ${CABLE_ROOT_BIN}/..) +# Find the cable include directory in a path relative to the cable +# executable. +FIND_PATH(CABLE_INCLUDE_DIR WrapTclFacility/wrapCalls.h + ${CABLE_ROOT_BIN}/../include) -# Find the WrapTclFacility library in a path relative to the root of -# the CABLE installation. -FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES WrapTclFacility PATHS ${CABLE_ROOT}/lib) +# Find the WrapTclFacility library in a path relative to the cable +# executable. +FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES WrapTclFacility PATHS + ${CABLE_ROOT_BIN}/../lib) |