59 lines
2.0 KiB
Plaintext
59 lines
2.0 KiB
Plaintext
$OpenBSD: patch-Modules_FindTclStub_cmake,v 1.4 2013/06/06 12:47:06 dcoppa Exp $
|
|
--- Modules/FindTclStub.cmake.orig Wed May 15 19:38:12 2013
|
|
+++ Modules/FindTclStub.cmake Tue May 28 20:02:18 2013
|
|
@@ -38,13 +38,21 @@ include(${CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake)
|
|
|
|
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(MODTCL_VERSION)
|
|
+ set(TCL_TCLSH_VERSION "${MODTCL_VERSION}")
|
|
+else(MODTCL_VERSION)
|
|
+ string(REGEX REPLACE
|
|
+ "^.*tclsh([0-9]\\.*[0-9]).*$" "\\1" TCL_TCLSH_VERSION "${TCL_TCLSH}")
|
|
+endif(MODTCL_VERSION)
|
|
|
|
get_filename_component(TK_WISH_PATH "${TK_WISH}" PATH)
|
|
get_filename_component(TK_WISH_PATH_PARENT "${TK_WISH_PATH}" PATH)
|
|
-string(REGEX REPLACE
|
|
- "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}")
|
|
+if(MODTK_VERSION)
|
|
+ set(TK_WISH_VERSION "${MODTK_VERSION}")
|
|
+else(MODTK_VERSION)
|
|
+ string(REGEX REPLACE
|
|
+ "^.*wish([0-9]\\.*[0-9]).*$" "\\1" TK_WISH_VERSION "${TK_WISH}")
|
|
+endif(MODTK_VERSION)
|
|
|
|
get_filename_component(TCL_INCLUDE_PATH_PARENT "${TCL_INCLUDE_PATH}" PATH)
|
|
get_filename_component(TK_INCLUDE_PATH_PARENT "${TK_INCLUDE_PATH}" PATH)
|
|
@@ -59,14 +67,20 @@ get_filename_component(TK_LIBRARY_PATH_PARENT "${TK_LI
|
|
string(REGEX REPLACE
|
|
"^.*tk([0-9]\\.*[0-9]).*$" "\\1" TK_LIBRARY_VERSION "${TK_LIBRARY}")
|
|
|
|
-set(TCLTK_POSSIBLE_LIB_PATHS
|
|
- "${TCL_INCLUDE_PATH_PARENT}/lib"
|
|
- "${TK_INCLUDE_PATH_PARENT}/lib"
|
|
- "${TCL_LIBRARY_PATH}"
|
|
- "${TK_LIBRARY_PATH}"
|
|
- "${TCL_TCLSH_PATH_PARENT}/lib"
|
|
- "${TK_WISH_PATH_PARENT}/lib"
|
|
-)
|
|
+if(NOT "${TCLTK_OPENBSD_LIB_PATHS}" STREQUAL "")
|
|
+ set(TCLTK_POSSIBLE_LIB_PATHS
|
|
+ "${TCLTK_OPENBSD_LIB_PATHS}"
|
|
+ )
|
|
+else()
|
|
+ set(TCLTK_POSSIBLE_LIB_PATHS
|
|
+ "${TCL_INCLUDE_PATH_PARENT}/lib"
|
|
+ "${TK_INCLUDE_PATH_PARENT}/lib"
|
|
+ "${TCL_LIBRARY_PATH}"
|
|
+ "${TK_LIBRARY_PATH}"
|
|
+ "${TCL_TCLSH_PATH_PARENT}/lib"
|
|
+ "${TK_WISH_PATH_PARENT}/lib"
|
|
+ )
|
|
+endif()
|
|
|
|
if(WIN32)
|
|
get_filename_component(
|