diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index d7344231..2253f979 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -21,7 +21,7 @@ if(D_VERSION EQUAL 1) elseif(D_VERSION EQUAL 2) set(RUNTIME druntime) else(D_VERSION EQUAL 1) - message(FATAL_ERROR "set d version to 1 or 2") + message(FATAL_ERROR "The runtime must be built as part of the main CMake project.") endif(D_VERSION EQUAL 1) get_directory_property(PROJECT_PARENT_DIR DIRECTORY ${PROJECT_SOURCE_DIR} PARENT_DIRECTORY) set(RUNTIME_DIR ${PROJECT_PARENT_DIR}/${RUNTIME} CACHE PATH "runtime source dir") @@ -146,23 +146,6 @@ elseif(D_VERSION EQUAL 2) endif(PHOBOS2_DIR) endif(D_VERSION EQUAL 1) -# should only be necessary if run independently from ldc cmake project -if(NOT LDC_LOC) - if(NOT LDC_EXE) - if(D_VERSION EQUAL 1) - set(LDC_EXE ldc) - elseif(D_VERSION EQUAL 2) - set(LDC_EXE ldc2) - endif(D_VERSION EQUAL 1) - endif(NOT LDC_EXE) - - find_program(LDC_LOC ${LDC_EXE} ${PROJECT_BINARY_DIR}/../bin DOC "path to ldc binary") - if(NOT LDC_LOC) - message(SEND_ERROR "ldc not found") - endif(NOT LDC_LOC) - set(LDC_EXE_NAME ${LDC_EXE}) -endif(NOT LDC_LOC) - configure_file(${PROJECT_PARENT_DIR}/${CONFIG_NAME}.conf.in ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}.conf) # Prepare the config files for installation in bin. configure_file(${PROJECT_PARENT_DIR}/${LDC_EXE}_install.conf.in ${PROJECT_BINARY_DIR}/../bin/${LDC_EXE}_install.conf)