Skip to content

Commit

Permalink
Moved druntime and Phobos submodules to runtime.
Browse files Browse the repository at this point in the history
This makes much more sense since the subdirecotry also contains the build system for them, and reduces clutter.
  • Loading branch information
dnadlinger committed Dec 4, 2011
1 parent 38d1bf4 commit 74d7562
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "druntime"]
path = druntime
path = runtime/druntime
url = git://github.com/ldc-developers/druntime.git
[submodule "phobos"]
path = phobos
path = runtime/phobos
url = git://github.com/ldc-developers/phobos.git
4 changes: 2 additions & 2 deletions runtime/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@ else(BUILD_SHARED_LIBS)
endif(BUILD_SHARED_LIBS)

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.
#

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_GC druntime-gc-basic)
set(RUNTIME_DC druntime-rt-ldc)
Expand Down
Submodule druntime updated from 000000 to 1c1b03
Submodule phobos updated from 000000 to 2bebc8

0 comments on commit 74d7562

Please sign in to comment.