mirror of
https://github.com/openbsd/ports.git
synced 2026-06-17 23:13:55 +02:00
rsadowski
e8035d4760
Major update from 3.31.8 to 4.1.2. CMake 4.0 introduces a breaking change: compatibility with versions older than 3.5 has been removed. Projects calling cmake_minimum_required() or cmake_policy() with versions < 3.5 now error out. To maintain compatibility with existing ports during the transition, the cmake module now provides MODCMAKE_POLICY_VERSION_OVERRIDE (idea from sthen@) support: - MODCMAKE_POLICY_VERSION_OVERRIDE ?= No - MODCMAKE_POLICY_VERSION_OVERRIDE_VER ?= 3.5 When MODCMAKE_POLICY_VERSION_OVERRIDE is set to "yes", CMake is instructed to accept policy versions down to the specified minimum (default 3.5) via -DCMAKE_POLICY_VERSION_MINIMUM. This allows older ports to build while acknowledging they may use deprecated features. https://cmake.org/cmake/help/latest/release/4.0.html https://cmake.org/cmake/help/latest/release/4.1.html OK sthen@
64 lines
2.0 KiB
Plaintext
64 lines
2.0 KiB
Plaintext
Index: Modules/FindTclStub.cmake
|
|
--- Modules/FindTclStub.cmake.orig
|
|
+++ Modules/FindTclStub.cmake
|
|
@@ -56,15 +56,26 @@ Online references:
|
|
|
|
include(${CMAKE_CURRENT_LIST_DIR}/FindTCL.cmake)
|
|
|
|
+set(MODTCL_VERSION $ENV{MODTCL_VERSION})
|
|
+set(MODTK_VERSION $ENV{MODTK_VERSION})/MODTK_VERSION
|
|
+
|
|
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)
|
|
@@ -79,14 +90,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(
|