summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastien Helleu <flashcode@flashtux.org>2008-10-20 09:58:05 +0200
committerSebastien Helleu <flashcode@flashtux.org>2008-10-20 09:58:05 +0200
commitac3c91937688a776dd93749f2652fb1e2fe2e314 (patch)
tree9f91d2da48bebe40548c2ede6604fd9ed8981827
parent213783b0c190a840360b0db099871e50ca6f5275 (diff)
parent3044bfc41d77b3cd55ffece20db1397510b312b9 (diff)
downloadweechat-ac3c91937688a776dd93749f2652fb1e2fe2e314.zip
Merge branch 'protocols' of ssh://git.sv.gnu.org/srv/git/weechat into protocols
-rw-r--r--cmake/FindTCL.cmake19
1 files changed, 10 insertions, 9 deletions
diff --git a/cmake/FindTCL.cmake b/cmake/FindTCL.cmake
index 3c6fefc3f..1b2601b2f 100644
--- a/cmake/FindTCL.cmake
+++ b/cmake/FindTCL.cmake
@@ -31,6 +31,10 @@
# this point it is safer you ask directly where the *source* tree is
# and dig from there.
+IF(TCL_FOUND)
+ SET(TCL_FIND_QUIETLY TRUE)
+ENDIF(TCL_FOUND)
+
INCLUDE(CMakeFindFrameworks)
INCLUDE(FindTclsh)
@@ -141,15 +145,12 @@ FIND_PATH(TCL_INCLUDE_PATH
PATHS ${TCL_POSSIBLE_INCLUDE_PATHS}
)
-# handle the QUIETLY and REQUIRED arguments and set TCL_FOUND to TRUE if
-# all listed variables are TRUE
-INCLUDE(FindPackageHandleStandardArgs)
-
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH)
-SET(TCL_FIND_REQUIRED ${TCL_FIND_REQUIRED})
-SET(TCL_FIND_QUIETLY ${TCL_FIND_QUIETLY})
-SET(TCL_VERSION ${TCL_VERSION})
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(TCL DEFAULT_MSG TCL_LIBRARY TCL_INCLUDE_PATH)
+IF(TCL_LIBRARY AND TCL_INCLUDE_PATH)
+ SET(TCL_VERSION ${TCL_VERSION})
+ SET(TCL_LIBARY ${TCL_LIBRARY})
+ SET(TCL_INCLUDE_PATH ${TCL_INCLUDE_PATH})
+ SET(TCL_FOUND TRUE)
+ENDIF(TCL_LIBRARY AND TCL_INCLUDE_PATH)
MARK_AS_ADVANCED(
TCL_INCLUDE_PATH