Skip to content

Commit

Permalink
replace the range with a minimum.
Browse files Browse the repository at this point in the history
subsequent logic assumes there will be dirs and products like tcl86, so likely needs more work.  probably inadequate if we find a system 8.7+ for example, but we at least use vars which are hopefully set during find_package().
  • Loading branch information
brlcad committed Aug 6, 2024
1 parent f607741 commit c5c6821
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions tcl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ else (USE_BRLCAD)

endif (USE_BRLCAD)

# minimum version of Tcl supported
set(TCL_MAJOR_VERSION 8)
set(TCL_MINOR_VERSION 6)
set(TCL_VERSION "${TCL_MAJOR_VERSION}.${TCL_MINOR_VERSION}")
Expand All @@ -21,7 +22,7 @@ if (NOT ENABLE_TCL AND NOT DISABLE_TCL)

set(TCL_ENABLE_TK ON CACHE BOOL "enable tk")
set(CMAKE_FIND_FRAMEWORK NEVER)
find_package(TCL "8.6...<9.0")
find_package(TCL $TCL_VERSION)

if (NOT TCL_FOUND AND NOT DEFINED ENABLE_TCL)
set(ENABLE_TCL "ON" CACHE BOOL "Enable tcl build")
Expand Down Expand Up @@ -135,7 +136,7 @@ if (ENABLE_TCL)
if (MSVC)
set(LIB_PREFIX)
set(SHARED_DIR ${BIN_DIR})
set(TCL_VERSION "86")
set(TCL_VERSION "${TCL_MAJOR_VERSION}${TCL_MINOR_VERSION}")
else (MSVC)
set(LIB_PREFIX "lib")
set(SHARED_DIR ${LIB_DIR})
Expand Down

0 comments on commit c5c6821

Please sign in to comment.