--- cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake.orig 2019-06-02 08:24:33.000000000 +0900 +++ cmake/modules/language_support/cmake/CMakeTestDCompiler.cmake 2019-08-12 11:38:09.000000000 +0900 @@ -98,8 +98,8 @@ OUTPUT_VARIABLE OUTPUT) ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") TRY_COMPILE(CMAKE_D_PHOBOS_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d - CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos.a" - COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import" + CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libphobos2.a" + COMPILE_DEFINITIONS "-I${D_PATH}/include/phobos -I${D_PATH}/include/druntime/import" OUTPUT_VARIABLE OUTPUT) ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ENDIF(CMAKE_COMPILER_IS_GDC) @@ -138,8 +138,8 @@ OUTPUT_VARIABLE OUTPUT) ELSE(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") TRY_COMPILE(CMAKE_D_TANGO_WORKS ${CMAKE_BINARY_DIR} ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/testDCompiler.d - CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos.a" - COMPILE_DEFINITIONS "-I${D_PATH}/include -I${D_PATH}/import" + CMAKE_FLAGS "-DLINK_LIBRARIES=${D_PATH}/lib/libtango.a;${D_PATH}/lib/libphobos2.a" + COMPILE_DEFINITIONS "-I${D_PATH}/include/phobos -I${D_PATH}/include/druntime/import" OUTPUT_VARIABLE OUTPUT) ENDIF(${CMAKE_SYSTEM_NAME} STREQUAL "Windows") ENDIF(CMAKE_COMPILER_IS_GDC)