From 2dd73874acb910aca12a13de4ae81652078f4498 Mon Sep 17 00:00:00 2001 From: Alexey Prokhin Date: Thu, 15 Sep 2011 14:45:40 +0400 Subject: [PATCH] Fixed druntime and phobos paths in CMakeLists --- runtime/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 325b6e0c..8cd9e6c4 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -24,7 +24,7 @@ else(D_VERSION EQUAL 1) message(FATAL_ERROR "set d version to 1 or 2") 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") +set(RUNTIME_DIR ${PROJECT_PARENT_DIR}/${RUNTIME} CACHE PATH "runtime source dir") if(D_VERSION EQUAL 1) # copy imports to runtime dir @@ -62,7 +62,7 @@ if(D_VERSION EQUAL 1) file(GLOB DCRT_C ${RUNTIME_DC_DIR}/*.c) set(CONFIG_NAME ${LDC_EXE}) elseif(D_VERSION EQUAL 2) - set(PHOBOS2_DIR ${PROJECT_PARENT_DIR}/../${RUNTIME} CACHE PATH "phobos2 source dir") + set(PHOBOS2_DIR ${PROJECT_PARENT_DIR}/phobos CACHE PATH "phobos2 source dir") set(RUNTIME_CC druntime-core) set(RUNTIME_GC druntime-gc-basic) set(RUNTIME_DC druntime-rt-ldc)