Skip to content

Commit 71f687d

Browse files
committed
Use DKCODER_TOOL_MODULE not DKCODER_TOOL_VERSION
1 parent 36a3428 commit 71f687d

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

__dk.cmake

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ endfunction()
363363
# - DKCODER_TOOL - location of the `dkcoder-tool` executable
364364
# - DKCODER_VERSION - dotted form of DkCoder like 0.2.0.1
365365
# - DKCODER_RUN - location of the `DkCoder_Edge-Run` executable (here "Edge" means the latest version for the VERSION; aka. the VERSION itself)
366-
# - DKCODER_TOOL_VERSION - `Env` or `V0_2`. Whatever was used to launch in `./dk DkRun_V0_2.Run` (etc.)
366+
# - DKCODER_TOOL_MODULE - `DkRun_Env.Run` or `DkRun_V0_2.Run`. Whatever was used to launch in `./dk DkRun_V0_2.Run` (etc.)
367367
# - DKCODER_HELPERS - location of bin directory or DkCoder.bundle/Contents/Helpers on macOS
368368
# - DKCODER_ETC - location of etc/dkcoder directory
369369
# - DKCODER_BASE_SITELIB - location of lib/ directory containing the base system that at minimum includes the ocaml-system (ie. lib/ocaml/)
@@ -621,8 +621,8 @@ stdlib="@DKCODER_HOME@/DkCoder.bundle/Contents/Resources/lib/ocaml"]] @ONLY NEWL
621621
# Export version
622622
set(DKCODER_VERSION "${compile_version}" PARENT_SCOPE)
623623

624-
# Export run vid (Env or V0_1)
625-
set(DKCODER_TOOL_VERSION "${V_id}" PARENT_SCOPE)
624+
# Export run module (Env or V0_1)
625+
set(DKCODER_TOOL_MODULE "DkRun_${V_id}.Run" PARENT_SCOPE)
626626
endfunction()
627627

628628
macro(__dkcoder_prep_environment)
@@ -709,7 +709,7 @@ function(__dkcoder_delegate)
709709
__dkcoder_add_environment_set("DKCODER_NINJA_EXE=${CMAKE_MAKE_PROGRAM}")
710710
endif()
711711

712-
# Propagate DKCODER_SHARE and DKCODER_HELPERS and DKCODER_TOOL_VERSION.
712+
# Propagate DKCODER_SHARE and DKCODER_HELPERS and DKCODER_TOOL_MODULE.
713713
# Why not DKCODER_HOST_ABI? DkRun has a hardcoded default (so ABI hardcoding comes from the downloaded DkRun
714714
# which is chosen by ./dk). But we don't change the default since a future DkRun may have a better
715715
# detection of ABI (ex. ./dk downloads x86_64 for macOS but ABI is detected as arm64).
@@ -729,7 +729,7 @@ function(__dkcoder_delegate)
729729
elseif(ARG_VERSION VERSION_GREATER 0.4.0.1)
730730
__dkcoder_add_environment_set("DKCODER_SITELIB=${DKCODER_BASE_SITELIB_NATIVE}")
731731
endif()
732-
__dkcoder_add_environment_set("DKCODER_TOOL_VERSION=${DKCODER_TOOL_VERSION}")
732+
__dkcoder_add_environment_set("DKCODER_TOOL_MODULE=${DKCODER_TOOL_MODULE}")
733733
__dkcoder_add_environment_set("DKCODER_TOOL_ENV_URL_BASE=${__DkRun_Env_URL_BASE}")
734734
__dkcoder_add_environment_set("DKCODER_PWD=${DKCODER_PWD}")
735735
__dkcoder_add_environment_set("DKCODER_ARG0=${DKCODER_ARG0}")

0 commit comments

Comments
 (0)