Browse Source

ENH: clean modules (doc, make stuff advanced, etc.)

pull/1/head
Sebastien Barre 23 years ago
parent
commit
64a1707aee
  1. 10
      Modules/FindCABLE.cmake
  2. 1
      Modules/FindTclsh.cmake
  3. 12
      Modules/FindX11.cmake

10
Modules/FindCABLE.cmake

@ -35,7 +35,7 @@ IF(CABLE_BUILD_DIR)
${CABLE_BINARY_DIR}/CableTclFacility
${CABLE_BINARY_DIR}/CableTclFacility/*)
ENDIF(CABLE_LIBRARY_PATH)
IF(CABLE_EXECUTABLE_PATH)
FIND_PROGRAM(CABLE NAMES cable PATHS
${CABLE_EXECUTABLE_PATH}
@ -45,22 +45,22 @@ IF(CABLE_BUILD_DIR)
${CABLE_BINARY_DIR}/Executables
${CABLE_BINARY_DIR}/Executables/*)
ENDIF(CABLE_EXECUTABLE_PATH)
FIND_PATH(CABLE_INCLUDE_DIR CableTclFacility/ctCalls.h
${CABLE_SOURCE_DIR})
ELSE(CABLE_BUILD_DIR)
# Find the cable executable in the path.
FIND_PROGRAM(CABLE NAMES cable)
# Get the path where the executable sits, but without the executable
# name on it.
GET_FILENAME_COMPONENT(CABLE_ROOT_BIN ${CABLE} PATH)
# Find the cable include directory in a path relative to the cable
# executable.
FIND_PATH(CABLE_INCLUDE_DIR CableTclFacility/ctCalls.h
${CABLE_ROOT_BIN}/../share/Cable/include)
# Find the WrapTclFacility library in a path relative to the cable
# executable.
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES CableTclFacility PATHS

1
Modules/FindTclsh.cmake

@ -4,7 +4,6 @@
# the library is. This code sets the following variables:
#
# TCL_TCLSH = the full path to the tclsh binary (tcl tcl80 etc)
# TK_WISH = the full path to the wish binary (wish wish80 etc)
#
# In cygwin, look for the cygwin version first. Don't look for it later to

12
Modules/FindX11.cmake

@ -1,9 +1,8 @@
#
# try to find X11 libraries on UNIX systems once done this will define
#
# X11_INCLUDE_PATH = where the GL include directory can be found
# X11_LIB_PATH = where the GL library can be found
# X11_LIBRARY = the name of the OpenGL library to link with
# X11_INCLUDE_PATH = where the X11 include directory can be found
# X11_LIBRARY = the name of the X11 library to link with
#
IF (WIN32)
@ -16,6 +15,9 @@ ELSE (WIN32)
/opt/graphics/OpenGL/include
/usr/X11R6/include
)
MARK_AS_ADVANCED(
X11_INCLUDE_PATH
)
FIND_LIBRARY(X11_LIBRARY libX11.so
/usr/lib
@ -25,3 +27,7 @@ ELSE (WIN32)
)
ENDIF (WIN32)
MARK_AS_ADVANCED(
X11_LIBRARY
)
Loading…
Cancel
Save