Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
CMake
CMake
Commits
a98f99a8
Commit
a98f99a8
authored
Feb 01, 2012
by
David Cole
Committed by
Kitware Robot
Feb 01, 2012
Browse files
Options
Browse Files
Download
Plain Diff
Merge topic 'improve-findtclsh'
e01fe583
FindTclsh: support version selection
parents
b7fd0242
e01fe583
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
5 deletions
+19
-5
Modules/FindTCL.cmake
Modules/FindTCL.cmake
+8
-4
Modules/FindTclsh.cmake
Modules/FindTclsh.cmake
+11
-1
No files found.
Modules/FindTCL.cmake
View file @
a98f99a8
...
...
@@ -48,10 +48,14 @@ INCLUDE(CMakeFindFrameworks)
INCLUDE
(
FindTclsh
)
INCLUDE
(
FindWish
)
GET_FILENAME_COMPONENT
(
TCL_TCLSH_PATH
"
${
TCL_TCLSH
}
"
PATH
)
GET_FILENAME_COMPONENT
(
TCL_TCLSH_PATH_PARENT
"
${
TCL_TCLSH_PATH
}
"
PATH
)
STRING
(
REGEX REPLACE
"^.*tclsh([0-9]
\\
.*[0-9]).*$"
"
\\
1"
TCL_TCLSH_VERSION
"
${
TCL_TCLSH
}
"
)
IF
(
TCLSH_VERSION_STRING
)
SET
(
TCL_TCLSH_VERSION
"
${
TCLSH_VERSION_STRING
}
"
)
ELSE
(
TCLSH_VERSION_STRING
)
GET_FILENAME_COMPONENT
(
TCL_TCLSH_PATH
"
${
TCL_TCLSH
}
"
PATH
)
GET_FILENAME_COMPONENT
(
TCL_TCLSH_PATH_PARENT
"
${
TCL_TCLSH_PATH
}
"
PATH
)
STRING
(
REGEX REPLACE
"^.*tclsh([0-9]
\\
.*[0-9]).*$"
"
\\
1"
TCL_TCLSH_VERSION
"
${
TCL_TCLSH
}
"
)
ENDIF
(
TCLSH_VERSION_STRING
)
GET_FILENAME_COMPONENT
(
TK_WISH_PATH
"
${
TK_WISH
}
"
PATH
)
GET_FILENAME_COMPONENT
(
TK_WISH_PATH_PARENT
"
${
TK_WISH_PATH
}
"
PATH
)
...
...
Modules/FindTclsh.cmake
View file @
a98f99a8
...
...
@@ -82,9 +82,19 @@ FIND_PROGRAM(TCL_TCLSH
HINTS
${
TCLTK_POSSIBLE_BIN_PATHS
}
)
IF
(
TCL_TCLSH
)
EXECUTE_PROCESS
(
COMMAND
"
${
CMAKE_COMMAND
}
"
-E echo puts
"
\$
tcl_version"
COMMAND
"
${
TCL_TCLSH
}
"
OUTPUT_VARIABLE TCLSH_VERSION_STRING
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE
)
ENDIF
(
TCL_TCLSH
)
# handle the QUIETLY and REQUIRED arguments and set TIFF_FOUND to TRUE if
# all listed variables are TRUE
INCLUDE
(
${
CMAKE_CURRENT_LIST_DIR
}
/FindPackageHandleStandardArgs.cmake
)
FIND_PACKAGE_HANDLE_STANDARD_ARGS
(
Tclsh DEFAULT_MSG TCL_TCLSH
)
FIND_PACKAGE_HANDLE_STANDARD_ARGS
(
Tclsh
REQUIRED_VARS TCL_TCLSH
VERSION_VAR TCLSH_VERSION_STRING
)
MARK_AS_ADVANCED
(
TCL_TCLSH
)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment