@@ -363,7 +363,7 @@ endfunction()
363
363
# - DKCODER_TOOL - location of the `dkcoder-tool` executable
364
364
# - DKCODER_VERSION - dotted form of DkCoder like 0.2.0.1
365
365
# - 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.)
367
367
# - DKCODER_HELPERS - location of bin directory or DkCoder.bundle/Contents/Helpers on macOS
368
368
# - DKCODER_ETC - location of etc/dkcoder directory
369
369
# - 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
621
621
# Export version
622
622
set (DKCODER_VERSION "${compile_version} " PARENT_SCOPE)
623
623
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)
626
626
endfunction ()
627
627
628
628
macro (__dkcoder_prep_environment)
@@ -709,7 +709,7 @@ function(__dkcoder_delegate)
709
709
__dkcoder_add_environment_set("DKCODER_NINJA_EXE=${CMAKE_MAKE_PROGRAM} " )
710
710
endif ()
711
711
712
- # Propagate DKCODER_SHARE and DKCODER_HELPERS and DKCODER_TOOL_VERSION .
712
+ # Propagate DKCODER_SHARE and DKCODER_HELPERS and DKCODER_TOOL_MODULE .
713
713
# Why not DKCODER_HOST_ABI? DkRun has a hardcoded default (so ABI hardcoding comes from the downloaded DkRun
714
714
# which is chosen by ./dk). But we don't change the default since a future DkRun may have a better
715
715
# detection of ABI (ex. ./dk downloads x86_64 for macOS but ABI is detected as arm64).
@@ -729,7 +729,7 @@ function(__dkcoder_delegate)
729
729
elseif (ARG_VERSION VERSION_GREATER 0.4.0.1)
730
730
__dkcoder_add_environment_set("DKCODER_SITELIB=${DKCODER_BASE_SITELIB_NATIVE} " )
731
731
endif ()
732
- __dkcoder_add_environment_set("DKCODER_TOOL_VERSION =${DKCODER_TOOL_VERSION } " )
732
+ __dkcoder_add_environment_set("DKCODER_TOOL_MODULE =${DKCODER_TOOL_MODULE } " )
733
733
__dkcoder_add_environment_set("DKCODER_TOOL_ENV_URL_BASE=${__DkRun_Env_URL_BASE} " )
734
734
__dkcoder_add_environment_set("DKCODER_PWD=${DKCODER_PWD} " )
735
735
__dkcoder_add_environment_set("DKCODER_ARG0=${DKCODER_ARG0} " )
0 commit comments