Skip to content

fix: Tcl9 fixes, still compatible with tcl8 #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
resuna merged 3 commits into from
Aug 21, 2026
+6 −14
Merged

fix: Tcl9 fixes, still compatible with tcl8 #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6eafb5a
Get TCL paths from cmake modules instead of reading them from tea lea…
resuna Aug 21, 2026
dff64ca
Fix editing error
resuna Aug 21, 2026
fab32f6
tcl9 doesn't have make_safe TODO find out what the ramificatios are
resuna Aug 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
endif()
message(INFO " cmake build type ${CMAKE_BUILD_TYPE}")

set(TCLSH_VERSION_STRING, "8.6")

# Determine if cpptcl is built as a subproject (using add_subdirectory)
# or if it is the master project.
set(CPPTCL_MASTER_PROJECT OFF)
Expand All @@ -38,17 +36,9 @@ endif()

include (CTest)

set(TCL_VERSION_MAJOR "8" CACHE STRING "TCL Major version")
set(TCL_VERSION_MINOR "6" CACHE STRING "TCL Minor version")
set(TCL_TCLSH "tclsh${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
set(TCL_VER "${TCL_VERSION_MAJOR}.${TCL_VERSION_MINOR}")
set(TCL_VER_BSD "${TCL_VERSION_MAJOR}${TCL_VERSION_MINOR}")

message(INFO " TCL_VER ${TCL_VER}")

find_path(TCL_INCLUDE_PATH tcl.h PATHS /usr/local/include/tcl${TCL_VER} /usr/local/include /usr/include/tcl${TCL_VER} /usr/include NO_DEFAULT_PATH)
find_library(TCL_LIBRARY NAMES tcl${TCL_VER} tcl${TCL_VER_BSD} PATHS /usr/local/lib /usr/lib)
find_library(TCL_STUB_LIBRARY NAMES tclstub${TCL_VER} tclstub${TCL_VER_BSD} PATHS /usr/local/lib /usr/lib)
find_package(TCL)
find_package(TclStub)
find_package(Tclsh)

message(INFO " Tcl include ${TCL_INCLUDE_PATH}")
message(INFO " Tcl library ${TCL_LIBRARY}")
Expand Down
2 changes: 1 addition & 1 deletion COMMONmakefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ CPPTCL_LIBRARY = build/libcpptcl.so
all: $(CPPTCL_LIBRARY)

build/Makefile: CMakeLists.txt
(mkdir -p build; cd build; cmake -DTCL_VERSION_MINOR:STRING=$${TCL_VERSION_MINOR:-6} ..)
(mkdir -p build; cd build; cmake ..)

debug: CMakeLists.txt
(mkdir -p build; cd build; cmake -DCMAKE_BUILD_TYPE=Debug ..)
Expand Down
2 changes: 2 additions & 0 deletions test/test1.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,9 @@ int fun5(char const *s) { return std::string(s).size(); }
void test1() {
Tcl_Interp * interp = Tcl_CreateInterp();
interpreter i(interp, true);
#if (TCL_MAJOR_VERSION < 9)
i.make_safe();
#endif

std::string s = i.eval("return \"ala ma kota\"");
assert(s == "ala ma kota");
Expand Down
Loading