Browse files

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.
  • Loading branch information...
1 parent 38d1bf4 commit 74d7562a5916f997949722f6ae74719a612bc9ba @klickverbot klickverbot committed Dec 4, 2011
Showing with 4 additions and 4 deletions.
  1. +2 −2 .gitmodules
  2. +2 −2 runtime/CMakeLists.txt
  3. 0 { → runtime}/druntime
  4. 0 { → runtime}/phobos
View
4 .gitmodules
@@ -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
View
4 runtime/CMakeLists.txt
@@ -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)
View
0 druntime → runtime/druntime
File renamed without changes.
View
0 phobos → runtime/phobos
File renamed without changes.

0 comments on commit 74d7562

Please sign in to comment.