diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 2d2d7e8130..3b08893d34 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 3.4.3) -project(runtime C ASM) +project(runtime C ASM CXX) # CXX for integration tests only set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}) diff --git a/runtime/DRuntimeIntegrationTests.cmake b/runtime/DRuntimeIntegrationTests.cmake index 4b83eea932..45ff4e050b 100644 --- a/runtime/DRuntimeIntegrationTests.cmake +++ b/runtime/DRuntimeIntegrationTests.cmake @@ -78,6 +78,7 @@ foreach(name ${testnames}) add_test(NAME ${fullname} COMMAND ${GNU_MAKE_BIN} -C ${PROJECT_SOURCE_DIR}/druntime/test/${name} ROOT=${outdir} DMD=${LDMD_EXE_FULL} BUILD=${build} SHARED=1 + CC=${CMAKE_C_COMPILER} CXX=${CMAKE_CXX_COMPILER} DRUNTIME=${druntime_path_build} DRUNTIMESO=${shared_druntime_path_build} CFLAGS_BASE=${cflags_base} DFLAGS_BASE=${dflags_base} ${linkdl} )