ENH: clean modules (doc, make stuff advanced, etc.)
This commit is contained in:
parent
12d0b7c93d
commit
64a1707aee
@ -35,7 +35,7 @@ IF(CABLE_BUILD_DIR)
|
|||||||
${CABLE_BINARY_DIR}/CableTclFacility
|
${CABLE_BINARY_DIR}/CableTclFacility
|
||||||
${CABLE_BINARY_DIR}/CableTclFacility/*)
|
${CABLE_BINARY_DIR}/CableTclFacility/*)
|
||||||
ENDIF(CABLE_LIBRARY_PATH)
|
ENDIF(CABLE_LIBRARY_PATH)
|
||||||
|
|
||||||
IF(CABLE_EXECUTABLE_PATH)
|
IF(CABLE_EXECUTABLE_PATH)
|
||||||
FIND_PROGRAM(CABLE NAMES cable PATHS
|
FIND_PROGRAM(CABLE NAMES cable PATHS
|
||||||
${CABLE_EXECUTABLE_PATH}
|
${CABLE_EXECUTABLE_PATH}
|
||||||
@ -45,22 +45,22 @@ IF(CABLE_BUILD_DIR)
|
|||||||
${CABLE_BINARY_DIR}/Executables
|
${CABLE_BINARY_DIR}/Executables
|
||||||
${CABLE_BINARY_DIR}/Executables/*)
|
${CABLE_BINARY_DIR}/Executables/*)
|
||||||
ENDIF(CABLE_EXECUTABLE_PATH)
|
ENDIF(CABLE_EXECUTABLE_PATH)
|
||||||
|
|
||||||
FIND_PATH(CABLE_INCLUDE_DIR CableTclFacility/ctCalls.h
|
FIND_PATH(CABLE_INCLUDE_DIR CableTclFacility/ctCalls.h
|
||||||
${CABLE_SOURCE_DIR})
|
${CABLE_SOURCE_DIR})
|
||||||
ELSE(CABLE_BUILD_DIR)
|
ELSE(CABLE_BUILD_DIR)
|
||||||
# Find the cable executable in the path.
|
# Find the cable executable in the path.
|
||||||
FIND_PROGRAM(CABLE NAMES cable)
|
FIND_PROGRAM(CABLE NAMES cable)
|
||||||
|
|
||||||
# Get the path where the executable sits, but without the executable
|
# Get the path where the executable sits, but without the executable
|
||||||
# name on it.
|
# name on it.
|
||||||
GET_FILENAME_COMPONENT(CABLE_ROOT_BIN ${CABLE} PATH)
|
GET_FILENAME_COMPONENT(CABLE_ROOT_BIN ${CABLE} PATH)
|
||||||
|
|
||||||
# Find the cable include directory in a path relative to the cable
|
# Find the cable include directory in a path relative to the cable
|
||||||
# executable.
|
# executable.
|
||||||
FIND_PATH(CABLE_INCLUDE_DIR CableTclFacility/ctCalls.h
|
FIND_PATH(CABLE_INCLUDE_DIR CableTclFacility/ctCalls.h
|
||||||
${CABLE_ROOT_BIN}/../share/Cable/include)
|
${CABLE_ROOT_BIN}/../share/Cable/include)
|
||||||
|
|
||||||
# Find the WrapTclFacility library in a path relative to the cable
|
# Find the WrapTclFacility library in a path relative to the cable
|
||||||
# executable.
|
# executable.
|
||||||
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES CableTclFacility PATHS
|
FIND_LIBRARY(CABLE_TCL_LIBRARY NAMES CableTclFacility PATHS
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
# the library is. This code sets the following variables:
|
# the library is. This code sets the following variables:
|
||||||
#
|
#
|
||||||
# TCL_TCLSH = the full path to the tclsh binary (tcl tcl80 etc)
|
# 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
|
# In cygwin, look for the cygwin version first. Don't look for it later to
|
||||||
|
@ -1,9 +1,8 @@
|
|||||||
#
|
#
|
||||||
# try to find X11 libraries on UNIX systems once done this will define
|
# 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_INCLUDE_PATH = where the X11 include directory can be found
|
||||||
# X11_LIB_PATH = where the GL library can be found
|
# X11_LIBRARY = the name of the X11 library to link with
|
||||||
# X11_LIBRARY = the name of the OpenGL library to link with
|
|
||||||
#
|
#
|
||||||
|
|
||||||
IF (WIN32)
|
IF (WIN32)
|
||||||
@ -16,6 +15,9 @@ ELSE (WIN32)
|
|||||||
/opt/graphics/OpenGL/include
|
/opt/graphics/OpenGL/include
|
||||||
/usr/X11R6/include
|
/usr/X11R6/include
|
||||||
)
|
)
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
X11_INCLUDE_PATH
|
||||||
|
)
|
||||||
|
|
||||||
FIND_LIBRARY(X11_LIBRARY libX11.so
|
FIND_LIBRARY(X11_LIBRARY libX11.so
|
||||||
/usr/lib
|
/usr/lib
|
||||||
@ -25,3 +27,7 @@ ELSE (WIN32)
|
|||||||
)
|
)
|
||||||
|
|
||||||
ENDIF (WIN32)
|
ENDIF (WIN32)
|
||||||
|
|
||||||
|
MARK_AS_ADVANCED(
|
||||||
|
X11_LIBRARY
|
||||||
|
)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user