Moved druntime and Phobos submodules to runtime.

This makes much more sense since the subdirecotry also contains the build system for them, and reduces clutter.
This commit is contained in:
David Nadlinger
2011-12-04 20:37:11 +01:00
parent 38d1bf4cc8
commit 74d7562a59
4 changed files with 4 additions and 4 deletions

4
.gitmodules vendored
View File

@@ -1,6 +1,6 @@
[submodule "druntime"] [submodule "druntime"]
path = druntime path = runtime/druntime
url = git://github.com/ldc-developers/druntime.git url = git://github.com/ldc-developers/druntime.git
[submodule "phobos"] [submodule "phobos"]
path = phobos path = runtime/phobos
url = git://github.com/ldc-developers/phobos.git url = git://github.com/ldc-developers/phobos.git

View File

@@ -34,13 +34,13 @@ else(BUILD_SHARED_LIBS)
endif(BUILD_SHARED_LIBS) endif(BUILD_SHARED_LIBS)
get_directory_property(PROJECT_PARENT_DIR DIRECTORY ${PROJECT_SOURCE_DIR} PARENT_DIRECTORY) get_directory_property(PROJECT_PARENT_DIR DIRECTORY ${PROJECT_SOURCE_DIR} PARENT_DIRECTORY)
set(RUNTIME_DIR ${PROJECT_PARENT_DIR}/druntime CACHE PATH "runtime source dir") set(RUNTIME_DIR ${PROJECT_SOURCE_DIR}/druntime CACHE PATH "runtime source dir")
# #
# Gather source files. # Gather source files.
# #
set(PHOBOS2_DIR ${PROJECT_PARENT_DIR}/phobos CACHE PATH "phobos2 source dir") set(PHOBOS2_DIR ${PROJECT_SOURCE_DIR}/phobos CACHE PATH "phobos2 source dir")
set(RUNTIME_CC druntime-core) set(RUNTIME_CC druntime-core)
set(RUNTIME_GC druntime-gc-basic) set(RUNTIME_GC druntime-gc-basic)
set(RUNTIME_DC druntime-rt-ldc) set(RUNTIME_DC druntime-rt-ldc)