diff --git a/.gitlab/ci/configure_debian13_makefiles_clang.cmake b/.gitlab/ci/configure_debian13_makefiles_clang.cmake index fa92973075..c0cf7b5f8f 100644 --- a/.gitlab/ci/configure_debian13_makefiles_clang.cmake +++ b/.gitlab/ci/configure_debian13_makefiles_clang.cmake @@ -4,7 +4,8 @@ set(CMake_TEST_CXX_STANDARDS "98;11;14;17;20;23" CACHE STRING "") if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") set(CMake_TEST_IAR_TOOLCHAINS "/opt/iarsystems" CACHE PATH "") set(CMake_TEST_TICLANG_TOOLCHAINS "$ENV{CI_PROJECT_DIR}/.gitlab/ticlang" CACHE PATH "") - set(CMake_TEST_Emscripten_TOOLCHAINS "$ENV{CI_PROJECT_DIR}/.gitlab/emsdk/upstream/emscripten" CACHE PATH "") + set(CMake_TEST_Emscripten_TOOLCHAINS "$ENV{EMSDK}/upstream/emscripten" CACHE PATH "") + set(CMake_TEST_Emscripten_NODE "$ENV{EMSDK_NODE}" CACHE PATH "") endif() include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/.gitlab/ci/configure_debian13_ninja_clang.cmake b/.gitlab/ci/configure_debian13_ninja_clang.cmake index 7f45fa9e62..8280304c4e 100644 --- a/.gitlab/ci/configure_debian13_ninja_clang.cmake +++ b/.gitlab/ci/configure_debian13_ninja_clang.cmake @@ -1,7 +1,8 @@ if (NOT "$ENV{CMAKE_CI_NIGHTLY}" STREQUAL "") set(CMake_TEST_IAR_TOOLCHAINS "/opt/iarsystems" CACHE PATH "") set(CMake_TEST_TICLANG_TOOLCHAINS "$ENV{CI_PROJECT_DIR}/.gitlab/ticlang" CACHE PATH "") - set(CMake_TEST_Emscripten_TOOLCHAINS "$ENV{CI_PROJECT_DIR}/.gitlab/emsdk/upstream/emscripten" CACHE PATH "") + set(CMake_TEST_Emscripten_TOOLCHAINS "$ENV{EMSDK}/upstream/emscripten" CACHE PATH "") + set(CMake_TEST_Emscripten_NODE "$ENV{EMSDK_NODE}" CACHE PATH "") endif() include("${CMAKE_CURRENT_LIST_DIR}/configure_external_test.cmake") diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt index 8652a5c4e2..8d0c299dd1 100644 --- a/Tests/RunCMake/CMakeLists.txt +++ b/Tests/RunCMake/CMakeLists.txt @@ -1440,7 +1440,8 @@ if (CMake_TEST_Renesas_TOOLCHAINS) set_property(TEST RunCMake.Renesas APPEND PROPERTY LABELS "Renesas") endif() if(CMake_TEST_Emscripten_TOOLCHAINS) - add_RunCMake_test(Emscripten -DCMake_TEST_Emscripten_TOOLCHAINS=${CMake_TEST_Emscripten_TOOLCHAINS}) + add_RunCMake_test(Emscripten -DCMake_TEST_Emscripten_TOOLCHAINS=${CMake_TEST_Emscripten_TOOLCHAINS} + -DCMake_TEST_Emscripten_NODE=${CMake_TEST_Emscripten_NODE}) set_property(TEST RunCMake.Emscripten APPEND PROPERTY LABELS "Emscripten") endif()